From 721e03d7e6926055111d4edbbdf5f700a11ed58a Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Sun, 30 Dec 2018 15:23:34 +0200 Subject: Working on new Machine Designer. --- .../Modules/Tango.MachineStudio.DB/ViewModels/ConfigurationsViewVM.cs | 1 - 1 file changed, 1 deletion(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ConfigurationsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ConfigurationsViewVM.cs index 18c8c3daa..d5022c761 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ConfigurationsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ConfigurationsViewVM.cs @@ -18,7 +18,6 @@ namespace Tango.MachineStudio.DB.ViewModels protected override void InitializeEntity(Configuration entity) { base.InitializeEntity(entity); - entity.CreationDate = DateTime.UtcNow; } } } -- cgit v1.3.1 From e111c33bc87acf40202f9e5423e21b087a366f07 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Mon, 7 Jan 2019 16:06:38 +0200 Subject: Added new events !!! --- Software/DB/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/Tango_log.ldf | Bin 22675456 -> 22675456 bytes Software/PMR/Messages/Diagnostics/EventType.proto | 798 ++++++++----- .../EventTypeActionsToStringConverter.cs | 40 - .../Tango.MachineStudio.DB.csproj | 48 +- .../Tango.MachineStudio.DB/ViewModelLocator.cs | 28 - .../ViewModels/ActionTypesViewVM.cs | 18 - .../ViewModels/EventTypesGroupsViewVM.cs | 17 - .../ViewModels/EventTypesViewVM.cs | 71 -- .../Views/DBViews/ActionTypeView.xaml | 31 - .../Views/DBViews/ActionTypeView.xaml.cs | 28 - .../Views/DBViews/ActionTypesView.xaml | 25 - .../Views/DBViews/ActionTypesView.xaml.cs | 32 - .../Views/DBViews/EventTypeView.xaml | 55 - .../Views/DBViews/EventTypeView.xaml.cs | 34 - .../Views/DBViews/EventTypesGroupView.xaml | 31 - .../Views/DBViews/EventTypesGroupView.xaml.cs | 28 - .../Views/DBViews/EventTypesGroupsView.xaml | 26 - .../Views/DBViews/EventTypesGroupsView.xaml.cs | 30 - .../Views/DBViews/EventTypesView.xaml | 38 - .../Views/DBViews/EventTypesView.xaml.cs | 30 - .../ViewModels/MainViewVM.cs | 4 +- .../ViewModels/MainViewVM.cs | 10 +- .../ViewModels/EventsViewVM.cs | 6 +- .../Views/EventDetailsView.xaml | 4 +- .../Views/EventsView.xaml | 10 +- .../EventLogging/DefaultEventLogger.cs | 16 +- .../Html/IHtmlPresenter.cs | 14 - .../Tango.MachineStudio.Common.csproj | 3 +- .../Html/DefaultHtmlPresenter.cs | 25 - .../Html/HTML Templates/Thread Break.html | 48 - .../Tango.MachineStudio.UI/Html/HtmlWindow.xaml | 37 - .../Tango.MachineStudio.UI/Html/HtmlWindow.xaml.cs | 48 - .../DefaultStudioApplicationManager.cs | 2 +- .../Tango.MachineStudio.UI.csproj | 11 +- .../Tango.MachineStudio.UI/ViewModelLocator.cs | 4 - .../ViewModels/LoginViewVM.cs | 2 +- .../ViewModels/MainViewVM.cs | 21 +- .../Tango.PPC.Events/ViewModels/MainViewVM.cs | 16 +- .../EventLogging/DefaultEventLogger.cs | 16 +- .../PPCApplication/DefaultPPCApplicationManager.cs | 2 +- .../Visual_Studio/Resources/Events-old-old.xlsx | Bin 0 -> 2683901 bytes Software/Visual_Studio/Resources/Events-old.xlsx | Bin 0 -> 17123 bytes Software/Visual_Studio/Resources/Events.xlsx | Bin 17123 -> 32263 bytes .../Visual_Studio/Tango.BL/Entities/ActionType.cs | 19 - .../Tango.BL/Entities/ActionTypeBase.cs | 188 --- .../Tango.BL/Entities/DispenserBase.cs | 178 ++- .../Visual_Studio/Tango.BL/Entities/EventType.cs | 46 + .../Tango.BL/Entities/EventTypeBase.cs | 284 +++-- .../Tango.BL/Entities/EventTypesAction.cs | 19 - .../Tango.BL/Entities/EventTypesActionBase.cs | 161 --- .../Tango.BL/Entities/EventTypesCategory.cs | 19 - .../Tango.BL/Entities/EventTypesCategoryBase.cs | 188 --- .../Tango.BL/Entities/EventTypesGroup.cs | 19 - .../Tango.BL/Entities/EventTypesGroupBase.cs | 188 --- .../Visual_Studio/Tango.BL/Entities/HtmlPage.cs | 19 - .../Tango.BL/Entities/HtmlPageBase.cs | 226 ---- .../Visual_Studio/Tango.BL/Entities/Machine.cs | 9 +- .../Tango.BL/Entities/MachinesEvent.cs | 22 +- .../Tango.BL/Enumerations/ActionTypes.cs | 53 - .../Visual_Studio/Tango.BL/Enumerations/Actions.cs | 12 - .../Tango.BL/Enumerations/EventTypeActions.cs | 14 + .../Tango.BL/Enumerations/EventTypeCategories.cs | 36 + .../Tango.BL/Enumerations/EventTypeGroups.cs | 46 + .../Enumerations/EventTypeNotificationTimes.cs | 15 + .../Tango.BL/Enumerations/EventTypes.cs | 1256 +++++++++++++------- .../Tango.BL/Enumerations/EventTypesCategories.cs | 47 - .../Tango.BL/Enumerations/EventTypesGroups.cs | 71 -- .../Visual_Studio/Tango.BL/ObservableEntity.cs | 43 +- .../Visual_Studio/Tango.BL/ObservablesContext.cs | 40 - .../Tango.BL/ObservablesEntitiesAdapter.cs | 15 - .../ObservablesEntitiesAdapterExtension.cs | 190 --- .../Tango.BL/ObservablesStaticCollections.cs | 4 - .../ObservablesStaticCollectionsExtension.cs | 190 --- .../SerializableEntityContractResolver.cs | 7 + Software/Visual_Studio/Tango.BL/Tango.BL.csproj | 20 +- .../ExtensionMethods/StringExtensions.cs | 12 + .../Tango.DAL.Remote/DB/ACTION_TYPES.cs | 33 - .../Visual_Studio/Tango.DAL.Remote/DB/DISPENSER.cs | 6 +- .../Tango.DAL.Remote/DB/EVENT_TYPES.cs | 17 +- .../Tango.DAL.Remote/DB/EVENT_TYPES_ACTIONS.cs | 26 - .../Tango.DAL.Remote/DB/EVENT_TYPES_CATEGORIES.cs | 33 - .../Tango.DAL.Remote/DB/EVENT_TYPES_GROUPS.cs | 33 - .../Tango.DAL.Remote/DB/HTML_PAGES.cs | 34 - .../Tango.DAL.Remote/DB/RemoteADO.Context.cs | 5 - .../Tango.DAL.Remote/DB/RemoteADO.edmx | 417 +------ .../Tango.DAL.Remote/DB/RemoteADO.edmx.diagram | 152 ++- .../Tango.DAL.Remote/Tango.DAL.Remote.csproj | 17 +- .../Tango.PMR/Diagnostics/EventType.cs | 1116 +++++++++++------ .../Visual_Studio/Tango.UnitTesting/DAL_TST.cs | 2 +- .../ObservablesGenerator.cs | 7 +- .../Tango.EventsTypesGenerator/Program.cs | 42 +- .../Utilities/Tango.PMRGenerator.CLI/Program.cs | 55 +- 93 files changed, 2788 insertions(+), 4570 deletions(-) delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/EventTypeActionsToStringConverter.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ActionTypesViewVM.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesGroupsViewVM.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesViewVM.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypeView.xaml delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypeView.xaml.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypesView.xaml delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypesView.xaml.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypeView.xaml delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypeView.xaml.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupView.xaml delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupView.xaml.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupsView.xaml delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupsView.xaml.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesView.xaml delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesView.xaml.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Html/IHtmlPresenter.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/DefaultHtmlPresenter.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HTML Templates/Thread Break.html delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HtmlWindow.xaml delete mode 100644 Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HtmlWindow.xaml.cs create mode 100644 Software/Visual_Studio/Resources/Events-old-old.xlsx create mode 100644 Software/Visual_Studio/Resources/Events-old.xlsx delete mode 100644 Software/Visual_Studio/Tango.BL/Entities/ActionType.cs delete mode 100644 Software/Visual_Studio/Tango.BL/Entities/ActionTypeBase.cs delete mode 100644 Software/Visual_Studio/Tango.BL/Entities/EventTypesAction.cs delete mode 100644 Software/Visual_Studio/Tango.BL/Entities/EventTypesActionBase.cs delete mode 100644 Software/Visual_Studio/Tango.BL/Entities/EventTypesCategory.cs delete mode 100644 Software/Visual_Studio/Tango.BL/Entities/EventTypesCategoryBase.cs delete mode 100644 Software/Visual_Studio/Tango.BL/Entities/EventTypesGroup.cs delete mode 100644 Software/Visual_Studio/Tango.BL/Entities/EventTypesGroupBase.cs delete mode 100644 Software/Visual_Studio/Tango.BL/Entities/HtmlPage.cs delete mode 100644 Software/Visual_Studio/Tango.BL/Entities/HtmlPageBase.cs delete mode 100644 Software/Visual_Studio/Tango.BL/Enumerations/ActionTypes.cs delete mode 100644 Software/Visual_Studio/Tango.BL/Enumerations/Actions.cs create mode 100644 Software/Visual_Studio/Tango.BL/Enumerations/EventTypeActions.cs create mode 100644 Software/Visual_Studio/Tango.BL/Enumerations/EventTypeCategories.cs create mode 100644 Software/Visual_Studio/Tango.BL/Enumerations/EventTypeGroups.cs create mode 100644 Software/Visual_Studio/Tango.BL/Enumerations/EventTypeNotificationTimes.cs delete mode 100644 Software/Visual_Studio/Tango.BL/Enumerations/EventTypesCategories.cs delete mode 100644 Software/Visual_Studio/Tango.BL/Enumerations/EventTypesGroups.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Remote/DB/ACTION_TYPES.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES_ACTIONS.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES_CATEGORIES.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES_GROUPS.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Remote/DB/HTML_PAGES.cs (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels') diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf index 415b00ea5..71429596e 100644 Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf index 28e5e0884..72cdafc9f 100644 Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ diff --git a/Software/PMR/Messages/Diagnostics/EventType.proto b/Software/PMR/Messages/Diagnostics/EventType.proto index 7013d0bfa..8bdd8a407 100644 --- a/Software/PMR/Messages/Diagnostics/EventType.proto +++ b/Software/PMR/Messages/Diagnostics/EventType.proto @@ -16,451 +16,655 @@ option java_package = "com.twine.tango.pmr.diagnostics"; enum EventType { - //None (Group = Application, Category = Info, Actions = ) + //Must contain a 0 value None = 0; - // Thread Break (Group = Thread Feeding System, Category = Error, Actions = ) - ThreadBreak = 1; + //Could not complete power-up BIT. (Group = GeneralHardware, Category = Error) + POWER_UP_BIT_FAILURE = 1; - // Thread Tension Control Failure (Group = Thread Feeding System, Category = Error, Actions = ) - ThreadTensionControlFailure = 2; + //Emergency button pressed (Group = GeneralHardware, Category = Safety) + EMERGENCY_PUSH_BUTTON_PRESSED = 2; - // Feeder Cone Insufficiant (Group = Thread Feeding System, Category = Warning, Actions = ) - FeederConeInsufficiant = 3; + //Front cover 1 open (Group = GeneralHardware, Category = Error) + FRONT_COVER_1_OPEN = 3; - // Winder General Error (Group = Thread Feeding System, Category = Error, Actions = ) - WinderGeneralError = 4; + //Front cover 2 open (Group = GeneralHardware, Category = Error) + FRONT_COVER_2_OPEN = 4; - // Winder Cone Not Exists (Group = Thread Feeding System, Category = Warning, Actions = ) - WinderConeNotExists = 5; + //Front cover 3 open (Group = GeneralHardware, Category = Error) + FRONT_COVER_3_OPEN = 5; - // Thread Feeding General Error (Group = Thread Feeding System, Category = Error, Actions = ) - ThreadFeedingGeneralError = 6; + //Front cover 4 open (Group = GeneralHardware, Category = Error) + FRONT_COVER_4_OPEN = 6; - // Dyeing Head 1 Over Temperature (Group = Dryer Head, Category = Critical, Actions = ) - DyeingHead1OverTemperature = 7; + //Cartridges cover open (Group = GeneralHardware, Category = Warning) + CARTRIDGES_COVER_OPEN = 7; - // Dyeing Head 2 Over Temperature (Group = Dryer Head, Category = Critical, Actions = ) - DyeingHead2OverTemperature = 8; + //Rear cover open (Group = GeneralHardware, Category = Error) + REAR_COVER_OPEN = 8; - // Dyeing Head 3 Over Temperature (Group = Dryer Head, Category = Critical, Actions = ) - DyeingHead3OverTemperature = 9; + //Overtemperature in machine intern (Group = GeneralHardware, Category = Error) + MACHINE_INTERNAL_OVERTEMPERATURE = 9; - // Dyeing Head 4 Over Temperature (Group = Dryer Head, Category = Critical, Actions = ) - DyeingHead4OverTemperature = 10; + //Internal fans RPM too low (Group = GeneralHardware, Category = Warning) + MACHINE_FANS_RPM_TOO_LOW = 10; - // Dyeing Head 5 Over Temperature (Group = Dryer Head, Category = Critical, Actions = ) - DyeingHead5OverTemperature = 11; + //Internal fans stopped (Group = GeneralHardware, Category = Error) + MACHINE_FANS_STOPPED = 11; - // Dyeing Head 6 Over Temperature (Group = Dryer Head, Category = Critical, Actions = ) - DyeingHead6OverTemperature = 12; + //Thread break (Group = ThreadFeedingSystem, Category = Error) + THREAD_BREAK = 12; - // Dyeing Head Thermal Cutoff (Group = Dryer Head, Category = Critical, Actions = ) - DyeingHeadThermalCutoff = 13; + //Thread tension control faiure (Group = ThreadFeedingSystem, Category = Error) + THREAD_TENSION_CONTROL_FAILURE = 13; - // Dryer Over Temperature (Group = Dryer, Category = Critical, Actions = ) - DryerOverTemperature = 14; + //No cone in winder (Group = ThreadFeedingSystem, Category = Error) + WINDER_CONE_DOES_NOT_EXIST = 14; - // Dryer Thermal Cutoff (Group = Dryer, Category = Critical, Actions = ) - DryerThermalCutoff = 15; + //Overcurrent in feeder motor (Group = ThreadFeedingSystem, Category = Error) + FEEDER_MOTOR_OVERCURRENT = 15; - // Dyeing Head Heaters Current Out Of Range (Group = Dryer Head, Category = Error, Actions = ) - DyeingHeadHeatersCurrentOutOfRange = 16; + //Overcurrent in right loader motor (Group = ThreadFeedingSystem, Category = Error) + RIGHT_LOADER_MOTOR_OVERCURRENT = 16; - // Dryer Heaters Current Out Of Range (Group = Dryer, Category = Error, Actions = ) - DryerHeatersCurrentOutOfRange = 17; + //Overcurrent in puller motor (Group = ThreadFeedingSystem, Category = Error) + PULLER_MOTOR_OVERCURRENT = 17; - // Dryer Dying Head Cover Open (Group = Dryer, Category = Error, Actions = ) - DryerDHeadCoverOpen = 18; + //Overcurrent in left loader motor (Group = ThreadFeedingSystem, Category = Error) + LEFT_LOADER_MOTOR_OVERCURRENT = 18; - // Air Filter Clogged (Group = Waste Handling System, Category = Error, Actions = ) - AirFilterClogged = 19; + //Overcurrent in winder motor (Group = ThreadFeedingSystem, Category = Error) + WINDER_MOTOR_OVERCURRENT = 19; - // Air Filter Not Installed (Group = Waste Handling System, Category = Error, Actions = ) - AirFilterNotInstalled = 20; + //Overcurrent in screw motor (Group = ThreadFeedingSystem, Category = Error) + SCREW_MOTOR_OVERCURRENT = 20; - // WHS Failure (Group = Waste Handling System, Category = Error, Actions = ) - WHSFailure = 21; + //Overcurrent in loading arm motor (Group = ThreadFeedingSystem, Category = Error) + LOADING_ARM_MOTOR_OVERCURRENT = 21; - // Waste Container Is Almost Full (Group = Waste Handling System, Category = Warning, Actions = ) - WasteContainerIsAlmostFull = 22; + //Overtemperature in feeder motor (Group = ThreadFeedingSystem, Category = Error) + FEEDER_MOTOR_OVERTEMPERATURE = 22; - // Waste Container Is Full (Group = Waste Handling System, Category = Error, Actions = ) - WasteContainerIsFull = 23; + //Overtemperature in right loader motor (Group = ThreadFeedingSystem, Category = Error) + RIGHT_LOADER_MOTOR_OVERTEMPERATURE = 23; - // Dispenser 1 Empty (Group = Ink Delivery System, Category = Error, Actions = ) - Dispenser1Empty = 24; + //Overtemperature in puller motor (Group = ThreadFeedingSystem, Category = Error) + PULLER_MOTOR_OVERTEMPERATURE = 24; - // Dispenser 2 Empty (Group = Ink Delivery System, Category = Error, Actions = ) - Dispenser2Empty = 25; + //Overtemperature in left loader motor (Group = ThreadFeedingSystem, Category = Error) + LEFT_LOADER_MOTOR_OVERTEMPERATURE = 25; - // Dispenser 3 Empty (Group = Ink Delivery System, Category = Error, Actions = ) - Dispenser3Empty = 26; + //Overtemperature in winder motor (Group = ThreadFeedingSystem, Category = Error) + WINDER_MOTOR_OVERTEMPERATURE = 26; - // Dispenser 4 Empty (Group = Ink Delivery System, Category = Error, Actions = ) - Dispenser4Empty = 27; + //Overtemperature in screw motor (Group = ThreadFeedingSystem, Category = Error) + SCREW_MOTOR_OVERTEMPERATURE = 27; - // Dispenser 5 Empty (Group = Ink Delivery System, Category = Error, Actions = ) - Dispenser5Empty = 28; + //Overtemperature in loading arm motor (Group = ThreadFeedingSystem, Category = Error) + LOADING_ARM_MOTOR_OVERTEMPERATURE = 28; - // Dispenser 6 Empty (Group = Ink Delivery System, Category = Error, Actions = ) - Dispenser6Empty = 29; + //Feeder motor stalled (Group = ThreadFeedingSystem, Category = Error) + FEEDER_MOTOR_STALL = 29; - // Dispenser 7 Empty (Group = Ink Delivery System, Category = Error, Actions = ) - Dispenser7Empty = 30; + //Right loader motor stalled (Group = ThreadFeedingSystem, Category = Error) + RIGHT_LOADER_MOTOR_STALL = 30; - // Dispenser 8 Empty (Group = Ink Delivery System, Category = Error, Actions = ) - Dispenser8Empty = 31; + //Puller motor stalled (Group = ThreadFeedingSystem, Category = Error) + PULLER_MOTOR_STALL = 31; - // Dispenser 1 Low Level (Group = Ink Delivery System, Category = Error, Actions = ) - Dispenser1LowLevel = 32; + //Left loader motor stalled (Group = ThreadFeedingSystem, Category = Error) + LEFT_LOADER_MOTOR_STALL = 32; - // Dispenser 2 Low Level (Group = Ink Delivery System, Category = Error, Actions = ) - Dispenser2LowLevel = 33; + //Winder motor stalled (Group = ThreadFeedingSystem, Category = Error) + WINDER_MOTOR_STALL = 33; - // Dispenser 3 Low Level (Group = Ink Delivery System, Category = Error, Actions = ) - Dispenser3LowLevel = 34; + //Screw motor stalled (Group = ThreadFeedingSystem, Category = Error) + SCREW_MOTOR_STALL = 34; - // Dispenser 4 Low Level (Group = Ink Delivery System, Category = Error, Actions = ) - Dispenser4LowLevel = 35; + //Loading arm motor stalled (Group = ThreadFeedingSystem, Category = Error) + LOADING_ARM_MOTOR_STALL = 35; - // Dispenser 5 Low Level (Group = Ink Delivery System, Category = Error, Actions = ) - Dispenser5LowLevel = 36; + //Undervoltage in feeder motor (Group = ThreadFeedingSystem, Category = Error) + FEEDER_MOTOR_UNDERVOLTAGE = 36; - // Dispenser 6 Low Level (Group = Ink Delivery System, Category = Error, Actions = ) - Dispenser6LowLevel = 37; + //Undervoltage in right loader motor (Group = ThreadFeedingSystem, Category = Error) + RIGHT_LOADER_MOTOR_UNDERVOLTAGE = 37; - // Dispenser 7 Low Level (Group = Ink Delivery System, Category = Error, Actions = ) - Dispenser7LowLevel = 38; + //Undervoltage in puller motor (Group = ThreadFeedingSystem, Category = Error) + PULLER_MOTOR_UNDERVOLTAGE = 38; - // Dispenser 8 Low Level (Group = Ink Delivery System, Category = Error, Actions = ) - Dispenser8LowLevel = 39; + //Undervoltage in left loader motor (Group = ThreadFeedingSystem, Category = Error) + LEFT_LOADER_MOTOR_UNDERVOLTAGE = 39; - // Dispenser 1 Refill Failure (Group = Ink Delivery System, Category = Warning, Actions = ) - Dispenser1RefillFailure = 40; + //Undervoltage in winder motor (Group = ThreadFeedingSystem, Category = Error) + WINDER_MOTOR_UNDERVOLTAGE = 40; - // Dispenser 2 Refill Failure (Group = Ink Delivery System, Category = Warning, Actions = ) - Dispenser2RefillFailure = 41; + //Undervoltage in screw motor (Group = ThreadFeedingSystem, Category = Error) + SCREW_MOTOR_UNDERVOLTAGE = 41; - // Dispenser 3 Refill Failure (Group = Ink Delivery System, Category = Warning, Actions = ) - Dispenser3RefillFailure = 42; + //Undervoltage in loading arm motor (Group = ThreadFeedingSystem, Category = Error) + LOADING_ARM_MOTOR_UNDERVOLTAGE = 42; - // Dispenser 4 Refill Failure (Group = Ink Delivery System, Category = Warning, Actions = ) - Dispenser4RefillFailure = 43; + //LTFU up failure (Group = ThreadFeedingSystem, Category = Error) + LTFU_UP_TIMEOUT = 43; - // Dispenser 5 Refill Failure (Group = Ink Delivery System, Category = Warning, Actions = ) - Dispenser5RefillFailure = 44; + //LTFU down failure (Group = ThreadFeedingSystem, Category = Error) + LTFU_DOWN_TIMEOUT = 44; - // Dispenser 6 Refill Failure (Group = Ink Delivery System, Category = Warning, Actions = ) - Dispenser6RefillFailure = 45; + //RTFU up failure (Group = ThreadFeedingSystem, Category = Error) + RTFU_UP_TIMEOUT = 45; - // Dispenser 7 Refill Failure (Group = Ink Delivery System, Category = Warning, Actions = ) - Dispenser7RefillFailure = 46; + //RTFU down failure (Group = ThreadFeedingSystem, Category = Error) + RTFU_DOWN_TIMEOUT = 46; - // Dispenser 8 Refill Failure (Group = Ink Delivery System, Category = Warning, Actions = ) - Dispenser8RefillFailure = 47; + //Screw travel failure (Group = ThreadFeedingSystem, Category = Error) + SCREW_MOTOR_LIMIT_TIMEOUT = 47; - // Dispenser 1 Pressure (Group = Ink Delivery System, Category = Critical, Actions = ) - Dispenser1Pressure = 48; + //Overcurrent in dryer motor (Group = Dryer, Category = Error) + DRYER_MOTOR_OVERCURRENT = 48; - // Dispenser 2 Pressure (Group = Ink Delivery System, Category = Critical, Actions = ) - Dispenser2Pressure = 49; + //Overtemperature in dryer motor (Group = Dryer, Category = Error) + DRYER_MOTOR_OVERTEMPERATURE = 49; - // Dispenser 3 Pressure (Group = Ink Delivery System, Category = Critical, Actions = ) - Dispenser3Pressure = 50; + //Dryer motor stalled (Group = Dryer, Category = Error) + DRYER_MOTOR_STALL = 50; - // Dispenser 4 Pressure (Group = Ink Delivery System, Category = Critical, Actions = ) - Dispenser4Pressure = 51; + //Undervoltage in dryer motor (Group = Dryer, Category = Error) + DRYER_MOTOR_UNDERVOLTAGE = 51; - // Dispenser 5 Pressure (Group = Ink Delivery System, Category = Critical, Actions = ) - Dispenser5Pressure = 52; + //Dryer door open (Group = Dryer, Category = Safety) + DRYER_DOOR_OPEN = 52; - // Dispenser 6 Pressure (Group = Ink Delivery System, Category = Critical, Actions = ) - Dispenser6Pressure = 53; + //Overtemperature in dryer zone 1 (Group = Dryer, Category = Error) + DRYER_ZONE_1_OVERTEMPERATURE = 53; - // Dispenser 7 Pressure (Group = Ink Delivery System, Category = Critical, Actions = ) - Dispenser7Pressure = 54; + //Overtemperature in dryer zone 2 (Group = Dryer, Category = Error) + DRYER_ZONE_2_OVERTEMPERATURE = 54; - // Dispenser 8 Pressure (Group = Ink Delivery System, Category = Critical, Actions = ) - Dispenser8Pressure = 55; + //Undertemperature in dryer zone 1 (Group = Dryer, Category = Error) + DRYER_ZONE_1_UNDERTEMPERATURE_A = 55; - // Mid Tank 1 Empty (Group = Ink Delivery System, Category = Warning, Actions = ) - MidTank1Empty = 56; + //Undertemperature in dryer zone 2 (Group = Dryer, Category = Error) + DRYER_ZONE_2_UNDERTEMPERATURE_A = 56; - // Mid Tank 2 Empty (Group = Ink Delivery System, Category = Warning, Actions = ) - MidTank2Empty = 57; + //Undertemperature in dryer zone 1 (Group = Dryer, Category = Error) + DRYER_ZONE_1_UNDERTEMPERATURE_B = 57; - // Mid Tank 3 Empty (Group = Ink Delivery System, Category = Warning, Actions = ) - MidTank3Empty = 58; + //Undertemperature in dryer zone 2 (Group = Dryer, Category = Error) + DRYER_ZONE_2_UNDERTEMPERATURE_B = 58; - // Mid Tank 4 Empty (Group = Ink Delivery System, Category = Warning, Actions = ) - MidTank4Empty = 59; + //Overheating in dryer (Group = Dryer, Category = Safety) + DRYER_THERMAL_CUTOFF = 59; - // Mid Tank 5 Empty (Group = Ink Delivery System, Category = Warning, Actions = ) - MidTank5Empty = 60; + //Dryer zone 1 current out of range (Group = Dryer, Category = Error) + DRYER_HEATERS_ZONE_1_CURRENT_OUT_OF_RANGE = 60; - // Mid Tank 6 Empty (Group = Ink Delivery System, Category = Warning, Actions = ) - MidTank6Empty = 61; + //Dryer zone 2 current out of range (Group = Dryer, Category = Error) + DRYER_HEATERS_ZONE_2_CURRENT_OUT_OF_RANGE = 61; - // Mid Tank 7 Empty (Group = Ink Delivery System, Category = Warning, Actions = ) - MidTank7Empty = 62; + //Dryer zone 1 current loop break (Group = Dryer, Category = Error) + DRYER_HEATERS_ZONE_1_CURRENT_LOOP_BREAK = 62; - // Mid Tank 8 Empty (Group = Ink Delivery System, Category = Warning, Actions = ) - MidTank8Empty = 63; + //Dryer zone 2 current loop break (Group = Dryer, Category = Error) + DRYER_HEATERS_ZONE_2_CURRENT_LOOP_BREAK = 63; - // Mid Tank 1 Lowlevel (Group = Ink Delivery System, Category = Warning, Actions = ) - MidTank1Lowlevel = 64; + //Dryer fans RPM too low (Group = Dryer, Category = Warning) + DRYER_FAN_RPM_TOO_LOW = 64; - // Mid Tank 2 Lowlevel (Group = Ink Delivery System, Category = Warning, Actions = ) - MidTank2Lowlevel = 65; + //Dryer fan stopped (Group = Dryer, Category = Error) + DRYER_FAN_STOPPED = 65; - // Mid Tank 3 Lowlevel (Group = Ink Delivery System, Category = Warning, Actions = ) - MidTank3Lowlevel = 66; + //Overtemperature in dyeing head zone 1 (Group = DyeingHead, Category = Error) + DYEING_HEAD_ZONE_1_OVERTEMPERATURE = 66; - // Mid Tank 4 Lowlevel (Group = Ink Delivery System, Category = Warning, Actions = ) - MidTank4Lowlevel = 67; + //Overtemperature in dyeing head zone 2 (Group = DyeingHead, Category = Error) + DYEING_HEAD_ZONE_2_OVERTEMPERATURE = 67; - // Mid Tank 5 Lowlevel (Group = Ink Delivery System, Category = Warning, Actions = ) - MidTank5Lowlevel = 68; + //Overtemperature in dyeing head zone 3 (Group = DyeingHead, Category = Error) + DYEING_HEAD_ZONE_3_OVERTEMPERATURE = 68; - // Mid Tank 6 Lowlevel (Group = Ink Delivery System, Category = Warning, Actions = ) - MidTank6Lowlevel = 69; + //Overtemperature in dyeing head zone 4 (Group = DyeingHead, Category = Error) + DYEING_HEAD_ZONE_4_OVERTEMPERATURE = 69; - // Mid Tank 7 Lowlevel (Group = Ink Delivery System, Category = Warning, Actions = ) - MidTank7Lowlevel = 70; + //Overtemperature in dyeing head zone 5 (Group = DyeingHead, Category = Error) + DYEING_HEAD_ZONE_5_OVERTEMPERATURE = 70; - // Mid Tank 8 Lowlevel (Group = Ink Delivery System, Category = Warning, Actions = ) - MidTank8Lowlevel = 71; + //Overtemperature in dyeing head zone 6 (Group = DyeingHead, Category = Error) + DYEING_HEAD_ZONE_6_OVERTEMPERATURE = 71; - // Mid Tank 1 Not In Place (Group = Ink Delivery System, Category = Warning, Actions = ) - MidTank1NotInPlace = 72; + //Undertemperature in dyeing head zone 1 (Group = DyeingHead, Category = Error) + DYEING_HEAD_ZONE_1_UNDERTEMPERATURE_A = 72; - // Mid Tank 2 Not In Place (Group = Ink Delivery System, Category = Warning, Actions = ) - MidTank2NotInPlace = 73; + //Undertemperature in dyeing head zone 2 (Group = DyeingHead, Category = Error) + DYEING_HEAD_ZONE_2_UNDERTEMPERATURE_A = 73; - // Mid Tank 3 Not In Place (Group = Ink Delivery System, Category = Warning, Actions = ) - MidTank3NotInPlace = 74; + //Undertemperature in dyeing head zone 3 (Group = DyeingHead, Category = Error) + DYEING_HEAD_ZONE_3_UNDERTEMPERATURE_A = 74; - // Mid Tank 4 Not In Place (Group = Ink Delivery System, Category = Warning, Actions = ) - MidTank4NotInPlace = 75; + //Undertemperature in dyeing head zone 4 (Group = DyeingHead, Category = Error) + DYEING_HEAD_ZONE_4_UNDERTEMPERATURE_A = 75; - // Mid Tank 5 Not In Place (Group = Ink Delivery System, Category = Warning, Actions = ) - MidTank5NotInPlace = 76; + //Undertemperature in dyeing head zone 5 (Group = DyeingHead, Category = Error) + DYEING_HEAD_ZONE_5_UNDERTEMPERATURE_A = 76; - // Mid Tank 6 Not In Place (Group = Ink Delivery System, Category = Warning, Actions = ) - MidTank6NotInPlace = 77; + //Undertemperature in dyeing head zone 6 (Group = DyeingHead, Category = Error) + DYEING_HEAD_ZONE_6_UNDERTEMPERATURE_A = 77; - // Mid Tank 7 Not In Place (Group = Ink Delivery System, Category = Warning, Actions = ) - MidTank7NotInPlace = 78; + //Undertemperature in dyeing head zone 1 (Group = DyeingHead, Category = Error) + DYEING_HEAD_ZONE_1_UNDERTEMPERATURE_B = 78; - // Mid Tank 8 Not In Place (Group = Ink Delivery System, Category = Warning, Actions = ) - MidTank8NotInPlace = 79; + //Undertemperature in dyeing head zone 2 (Group = DyeingHead, Category = Error) + DYEING_HEAD_ZONE_2_UNDERTEMPERATURE_B = 79; - // System Built In Test Fail (Group = General Hardware, Category = Critical, Actions = ) - SystemBITFail = 80; + //Undertemperature in dyeing head zone 3 (Group = DyeingHead, Category = Error) + DYEING_HEAD_ZONE_3_UNDERTEMPERATURE_B = 80; - // General Internal Over Temperature (Group = General Hardware, Category = Critical, Actions = ) - GeneralInternalOverTemperature = 81; + //Undertemperature in dyeing head zone 4 (Group = DyeingHead, Category = Error) + DYEING_HEAD_ZONE_4_UNDERTEMPERATURE_B = 81; - // Machine Cover Open (Group = General Hardware, Category = Warning, Actions = ) - MachineCoverOpen = 82; + //Undertemperature in dyeing head zone 5 (Group = DyeingHead, Category = Error) + DYEING_HEAD_ZONE_5_UNDERTEMPERATURE_B = 82; - // Emergency Push Button Pressed (Group = General Hardware, Category = Critical, Actions = ) - EmergencyPushButtonPressed = 83; + //Undertemperature in dyeing head zone 6 (Group = DyeingHead, Category = Error) + DYEING_HEAD_ZONE_6_UNDERTEMPERATURE_B = 83; - // System General Error (Group = General Hardware, Category = Error, Actions = ) - SystemGeneralError = 84; + //Dyeing head zone 1 current out of range (Group = DyeingHead, Category = Error) + DYEING_HEAD_ZONE_1_CURRENT_OUT_OF_RANGE = 84; - // Motor Dryer Over Current (Group = Thread Feeding System, Category = Error, Actions = ) - MotorDryerOverCurrent = 93; + //Dyeing head zone 2 current out of range (Group = DyeingHead, Category = Error) + DYEING_HEAD_ZONE_2_CURRENT_OUT_OF_RANGE = 85; - // Motor Feeder Over Current (Group = Thread Feeding System, Category = Error, Actions = ) - MotorFeederOverCurrent = 94; + //Dyeing head zone 3 current out of range (Group = DyeingHead, Category = Error) + DYEING_HEAD_ZONE_3_CURRENT_OUT_OF_RANGE = 86; - // Motor Right Loader Over Current (Group = Thread Feeding System, Category = Error, Actions = ) - MotorRLoaderOverCurrent = 95; + //Dyeing head zone 4 current out of range (Group = DyeingHead, Category = Error) + DYEING_HEAD_ZONE_4_CURRENT_OUT_OF_RANGE = 87; - // Motor Pooler Over Current (Group = Thread Feeding System, Category = Error, Actions = ) - MotorPoolerOverCurrent = 96; + //Dyeing head zones 5 and 6 current out of range (Group = DyeingHead, Category = Error) + DYEING_HEAD_ZONE_5_6_CURRENT_OUT_OF_RANGE = 88; - // Motor Left Loader Over Current (Group = Thread Feeding System, Category = Error, Actions = ) - MotorLLoaderOverCurrent = 97; + //Dyeing head zone 1 current loop break (Group = DyeingHead, Category = Error) + DYEING_HEAD_ZONE_1_CURRENT_LOOP_BREAK = 89; - // Motor Winder Over Current (Group = Thread Feeding System, Category = Error, Actions = ) - MotorWinderOverCurrent = 98; + //Dyeing head zone 2 current loop break (Group = DyeingHead, Category = Error) + DYEING_HEAD_ZONE_2_CURRENT_LOOP_BREAK = 90; - // Motor Screw Over Current (Group = Thread Feeding System, Category = Error, Actions = ) - MotorScrewOverCurrent = 99; + //Dyeing head zone 3 current loop break (Group = DyeingHead, Category = Error) + DYEING_HEAD_ZONE_3_CURRENT_LOOP_BREAK = 91; - // Motor Loading Arm Over Current (Group = Thread Feeding System, Category = Error, Actions = ) - MotorLoadingArmOverCurrent = 100; + //Dyeing head zone 4 current loop break (Group = DyeingHead, Category = Error) + DYEING_HEAD_ZONE_4_CURRENT_LOOP_BREAK = 92; - // Motor Dispenser 1 Over Current (Group = Ink Delivery System, Category = Error, Actions = ) - MotorDispenser1OverCurrent = 101; + //Dyeing head zone 5 and 6 current loop break (Group = DyeingHead, Category = Error) + DYEING_HEAD_ZONE_5_6_CURRENT_LOOP_BREAK = 93; - // Motor Dispenser 2 Over Current (Group = Ink Delivery System, Category = Error, Actions = ) - MotorDispenser2OverCurrent = 102; + //Overheating in dyeing head (Group = DyeingHead, Category = Safety) + DYEING_HEAD_THERMAL_CUTOFF = 94; - // Motor Dispenser 3 Over Current (Group = Ink Delivery System, Category = Error, Actions = ) - MotorDispenser3OverCurrent = 103; + //Could not open dyeing head cover (Group = DyeingHead, Category = Error) + DYEING_HEAD_COVER_OPEN_TIMEOUT = 95; - // Motor Dispenser 4 Over Current (Group = Ink Delivery System, Category = Error, Actions = ) - MotorDispenser4OverCurrent = 104; + //Could not close dyeing head cover (Group = DyeingHead, Category = Error) + DYEING_HEAD_COVER_CLOSE_TIMEOUT = 96; - // Motor Dispenser 5 Over Current (Group = Ink Delivery System, Category = Error, Actions = ) - MotorDispenser5OverCurrent = 105; + //Overtemperature in mixer (Group = Mixer, Category = Error) + MIXER_OVERTEMPERATURE = 97; - // Motor Dispenser 6 Over Current (Group = Ink Delivery System, Category = Error, Actions = ) - MotorDispenser6OverCurrent = 106; + //Undertemperature in mixer (Group = Mixer, Category = Error) + MIXER_UNDERTEMPERATURE_A = 98; - // Motor Dispenser 7 Over Current (Group = Ink Delivery System, Category = Error, Actions = ) - MotorDispenser7OverCurrent = 107; + //Undertemperature in mixer (Group = Mixer, Category = Error) + MIXER_UNDERTEMPERATURE_B = 99; - // Motor Dispenser 8 Over Current (Group = Ink Delivery System, Category = Error, Actions = ) - MotorDispenser8OverCurrent = 108; + //Overheating in mixer (Group = Mixer, Category = Safety) + MIXER_THERMAL_CUTOFF = 100; - // Motor Dryer Over Temperature (Group = Thread Feeding System, Category = Error, Actions = ) - MotorDryerOverTemperature = 109; + //Mixer current out of range (Group = Mixer, Category = Error) + MIXER_CURRENT_OUT_OF_RANGE = 101; - // Motor Feeder Over Temperature (Group = Thread Feeding System, Category = Error, Actions = ) - MotorFeederOverTemperature = 110; + //Mixer current loop break (Group = Mixer, Category = Error) + MIXER_CURRENT_LOOP_BREAK = 102; - // Motor Right Loader Over Temperature (Group = Thread Feeding System, Category = Error, Actions = ) - MotorRLoaderOverTemperature = 111; + //Overpressure in dispenser 1 (Group = Dispensers, Category = Error) + DISPENSER_1_OVERPRESSURE = 103; - // Motor Pooler Over Temperature (Group = Thread Feeding System, Category = Error, Actions = ) - MotorPoolerOverTemperature = 112; + //Overpressure in dispenser 2 (Group = Dispensers, Category = Error) + DISPENSER_2_OVERPRESSURE = 104; - // Motor Left Loader Over Temperature (Group = Thread Feeding System, Category = Error, Actions = ) - MotorLLoaderOverTemperature = 113; + //Overpressure in dispenser 3 (Group = Dispensers, Category = Error) + DISPENSER_3_OVERPRESSURE = 105; - // Motor Winder Over Temperature (Group = Thread Feeding System, Category = Error, Actions = ) - MotorWinderOverTemperature = 114; + //Overpressure in dispenser 4 (Group = Dispensers, Category = Error) + DISPENSER_4_OVERPRESSURE = 106; - // Motor Screw Over Temperature (Group = Thread Feeding System, Category = Error, Actions = ) - MotorScrewOverTemperature = 115; + //Overpressure in dispenser 5 (Group = Dispensers, Category = Error) + DISPENSER_5_OVERPRESSURE = 107; - // Motor Loading Arm Over Temperature (Group = Thread Feeding System, Category = Error, Actions = ) - MotorLoadingArmOverTemperature = 116; + //Overpressure in dispenser 6 (Group = Dispensers, Category = Error) + DISPENSER_6_OVERPRESSURE = 108; - // Motor Dispenser 1 Over Temperature (Group = Ink Delivery System, Category = Error, Actions = ) - MotorDispenser1OverTemperature = 117; + //Overpressure in dispenser 7 (Group = Dispensers, Category = Error) + DISPENSER_7_OVERPRESSURE = 109; - // Motor Dispenser 2 Over Temperature (Group = Ink Delivery System, Category = Error, Actions = ) - MotorDispenser2OverTemperature = 118; + //Overpressure in dispenser 8 (Group = Dispensers, Category = Error) + DISPENSER_8_OVERPRESSURE = 110; - // Motor Dispenser 3 Over Temperature (Group = Ink Delivery System, Category = Error, Actions = ) - MotorDispenser3OverTemperature = 119; + //Underpressure in dispenser 1 (Group = Dispensers, Category = Error) + DISPENSER_1_UNDERPRESSURE = 111; - // Motor Dispenser 4 Over Temperature (Group = Ink Delivery System, Category = Error, Actions = ) - MotorDispenser4OverTemperature = 120; + //Underpressure in dispenser 2 (Group = Dispensers, Category = Error) + DISPENSER_2_UNDERPRESSURE = 112; - // Motor Dispenser 5 Over Temperature (Group = Ink Delivery System, Category = Error, Actions = ) - MotorDispenser5OverTemperature = 121; + //Underpressure in dispenser 3 (Group = Dispensers, Category = Error) + DISPENSER_3_UNDERPRESSURE = 113; - // Motor Dispenser 6 Over Temperature (Group = Ink Delivery System, Category = Error, Actions = ) - MotorDispenser6OverTemperature = 122; + //Underpressure in dispenser 4 (Group = Dispensers, Category = Error) + DISPENSER_4_UNDERPRESSURE = 114; - // Motor Dispenser 7 Over Temperature (Group = Ink Delivery System, Category = Error, Actions = ) - MotorDispenser7OverTemperature = 123; + //Underpressure in dispenser 5 (Group = Dispensers, Category = Error) + DISPENSER_5_UNDERPRESSURE = 115; - // Motor Dispenser 8 Over Temperature (Group = Ink Delivery System, Category = Error, Actions = ) - MotorDispenser8OverTemperature = 124; + //Underpressure in dispenser 6 (Group = Dispensers, Category = Error) + DISPENSER_6_UNDERPRESSURE = 116; - // Motor Dryer Stall (Group = Thread Feeding System, Category = Error, Actions = ) - MotorDryerStall = 125; + //Underpressure in dispenser 7 (Group = Dispensers, Category = Error) + DISPENSER_7_UNDERPRESSURE = 117; - // Motor Feeder Stall (Group = Thread Feeding System, Category = Error, Actions = ) - MotorFeederStall = 126; + //Underpressure in dispenser 8 (Group = Dispensers, Category = Error) + DISPENSER_8_UNDERPRESSURE = 118; - // Motor Right Loader Stall (Group = Thread Feeding System, Category = Error, Actions = ) - MotorRLoaderStall = 127; + //Dispenser 1 empty (Group = Dispensers, Category = Error) + DISPENSER_1_EMPTY = 119; - // Motor Pooler Stall (Group = Thread Feeding System, Category = Error, Actions = ) - MotorPoolerStall = 128; + //Dispenser 2 empty (Group = Dispensers, Category = Error) + DISPENSER_2_EMPTY = 120; - // Motor Left Loader Stall (Group = Thread Feeding System, Category = Error, Actions = ) - MotorLLoaderStall = 129; + //Dispenser 3 empty (Group = Dispensers, Category = Error) + DISPENSER_3_EMPTY = 121; - // Motor Winder Stall (Group = Thread Feeding System, Category = Error, Actions = ) - MotorWinderStall = 130; + //Dispenser 4 empty (Group = Dispensers, Category = Error) + DISPENSER_4_EMPTY = 122; - // Motor Screw Stall (Group = Thread Feeding System, Category = Error, Actions = ) - MotorScrewStall = 131; + //Dispenser 5 empty (Group = Dispensers, Category = Error) + DISPENSER_5_EMPTY = 123; - // Motor Loading Arm Stall (Group = Thread Feeding System, Category = Error, Actions = ) - MotorLoadingArmStall = 132; + //Dispenser 6 empty (Group = Dispensers, Category = Error) + DISPENSER_6_EMPTY = 124; - // Motor Dispenser 1 Stall (Group = Ink Delivery System, Category = Error, Actions = ) - MotorDispenser1Stall = 133; + //Dispenser 7 empty (Group = Dispensers, Category = Error) + DISPENSER_7_EMPTY = 125; - // Motor Dispenser 2 Stall (Group = Ink Delivery System, Category = Error, Actions = ) - MotorDispenser2Stall = 134; + //Dispenser 8 empty (Group = Dispensers, Category = Error) + DISPENSER_8_EMPTY = 126; - // Motor Dispenser 3 Stall (Group = Ink Delivery System, Category = Error, Actions = ) - MotorDispenser3Stall = 135; + //Failed to refill dispenser 1 (Group = Dispensers, Category = Warning) + DISPENSER_1_REFILL_FAILURE = 127; - // Motor Dispenser 4 Stall (Group = Ink Delivery System, Category = Error, Actions = ) - MotorDispenser4Stall = 136; + //Failed to refill dispenser 2 (Group = Dispensers, Category = Warning) + DISPENSER_2_REFILL_FAILURE = 128; - // Motor Dispenser 5 Stall (Group = Ink Delivery System, Category = Error, Actions = ) - MotorDispenser5Stall = 137; + //Failed to refill dispenser 3 (Group = Dispensers, Category = Warning) + DISPENSER_3_REFILL_FAILURE = 129; - // Motor Dispenser 6 Stall (Group = Ink Delivery System, Category = Error, Actions = ) - MotorDispenser6Stall = 138; + //Failed to refill dispenser 4 (Group = Dispensers, Category = Warning) + DISPENSER_4_REFILL_FAILURE = 130; - // Motor Dispenser 7 Stall (Group = Ink Delivery System, Category = Error, Actions = ) - MotorDispenser7Stall = 139; + //Failed to refill dispenser 5 (Group = Dispensers, Category = Warning) + DISPENSER_5_REFILL_FAILURE = 131; - // Motor Dispenser 8 Stall (Group = Ink Delivery System, Category = Error, Actions = ) - MotorDispenser8Stall = 140; + //Failed to refill dispenser 6 (Group = Dispensers, Category = Warning) + DISPENSER_6_REFILL_FAILURE = 132; - // Motor Dryer Under Voltage (Group = Thread Feeding System, Category = Error, Actions = ) - MotorDryerUnderVoltage = 141; + //Failed to refill dispenser 7 (Group = Dispensers, Category = Warning) + DISPENSER_7_REFILL_FAILURE = 133; - // Motor Feeder Under Voltage (Group = Thread Feeding System, Category = Error, Actions = ) - MotorFeederUnderVoltage = 142; + //Failed to refill dispenser 8 (Group = Dispensers, Category = Warning) + DISPENSER_8_REFILL_FAILURE = 134; - // Motor Right Loader Under Voltage (Group = Thread Feeding System, Category = Error, Actions = ) - MotorRLoaderUnderVoltage = 143; + //Overcurrent in dispenser 1 motor (Group = Dispensers, Category = Error) + DISPENSER_1_MOTOR_OVERCURRENT = 135; - // Motor Pooler Under Voltage (Group = Thread Feeding System, Category = Error, Actions = ) - MotorPoolerUnderVoltage = 144; + //Overcurrent in dispenser 2 motor (Group = Dispensers, Category = Error) + DISPENSER_2_MOTOR_OVERCURRENT = 136; - // Motor Left Loader Under Voltage (Group = Thread Feeding System, Category = Error, Actions = ) - MotorLLoaderUnderVoltage = 145; + //Overcurrent in dispenser 3 motor (Group = Dispensers, Category = Error) + DISPENSER_3_MOTOR_OVERCURRENT = 137; - // Motor Winder Under Voltage (Group = Thread Feeding System, Category = Error, Actions = ) - MotorWinderUnderVoltage = 146; + //Overcurrent in dispenser 4 motor (Group = Dispensers, Category = Error) + DISPENSER_4_MOTOR_OVERCURRENT = 138; - // Motor Screw Under Voltage (Group = Thread Feeding System, Category = Error, Actions = ) - MotorScrewUnderVoltage = 147; + //Overcurrent in dispenser 5 motor (Group = Dispensers, Category = Error) + DISPENSER_5_MOTOR_OVERCURRENT = 139; - // Motor Loading Arm Under Voltage (Group = Thread Feeding System, Category = Error, Actions = ) - MotorLoadingArmUnderVoltage = 148; + //Overcurrent in dispenser 6 motor (Group = Dispensers, Category = Error) + DISPENSER_6_MOTOR_OVERCURRENT = 140; - // Motor Dispenser 1 Under Voltage (Group = Ink Delivery System, Category = Error, Actions = ) - MotorDispenser1UnderVoltage = 149; + //Overcurrent in dispenser 7 motor (Group = Dispensers, Category = Error) + DISPENSER_7_MOTOR_OVERCURRENT = 141; - // Motor Dispenser 2 Under Voltage (Group = Ink Delivery System, Category = Error, Actions = ) - MotorDispenser2UnderVoltage = 150; + //Overcurrent in dispenser 8 motor (Group = Dispensers, Category = Error) + DISPENSER_8_MOTOR_OVERCURRENT = 142; - // Motor Dispenser 3 Under Voltage (Group = Ink Delivery System, Category = Error, Actions = ) - MotorDispenser3UnderVoltage = 151; + //Overtemperature in dispenser 1 motor (Group = Dispensers, Category = Error) + DISPENSER_1_MOTOR_OVERTEMPERATURE = 143; - // Motor Dispenser 4 Under Voltage (Group = Ink Delivery System, Category = Error, Actions = ) - MotorDispenser4UnderVoltage = 152; + //Overtemperature in dispenser 2 motor (Group = Dispensers, Category = Error) + DISPENSER_2_MOTOR_OVERTEMPERATURE = 144; - // Motor Dispenser 5 Under Voltage (Group = Ink Delivery System, Category = Error, Actions = ) - MotorDispenser5UnderVoltage = 153; + //Overtemperature in dispenser 3 motor (Group = Dispensers, Category = Error) + DISPENSER_3_MOTOR_OVERTEMPERATURE = 145; - // Motor Dispenser 6 Under Voltage (Group = Ink Delivery System, Category = Error, Actions = ) - MotorDispenser6UnderVoltage = 154; + //Overtemperature in dispenser 4 motor (Group = Dispensers, Category = Error) + DISPENSER_4_MOTOR_OVERTEMPERATURE = 146; - // Motor Dispenser 7 Under Voltage (Group = Ink Delivery System, Category = Error, Actions = ) - MotorDispenser7UnderVoltage = 155; + //Overtemperature in dispenser 5 motor (Group = Dispensers, Category = Error) + DISPENSER_5_MOTOR_OVERTEMPERATURE = 147; - // Motor Dispenser 8 Under Voltage (Group = Ink Delivery System, Category = Error, Actions = ) - MotorDispenser8UnderVoltage = 156; + //Overtemperature in dispenser 6 motor (Group = Dispensers, Category = Error) + DISPENSER_6_MOTOR_OVERTEMPERATURE = 148; + + //Overtemperature in dispenser 7 motor (Group = Dispensers, Category = Error) + DISPENSER_7_MOTOR_OVERTEMPERATURE = 149; + + //Overtemperature in dispenser 8 motor (Group = Dispensers, Category = Error) + DISPENSER_8_MOTOR_OVERTEMPERATURE = 150; + + //Dispenser 1 motor stalled (Group = Dispensers, Category = Error) + DISPENSER_1_MOTOR_STALL = 151; + + //Dispenser 2 motor stalled (Group = Dispensers, Category = Error) + DISPENSER_2_MOTOR_STALL = 152; + + //Dispenser 3 motor stalled (Group = Dispensers, Category = Error) + DISPENSER_3_MOTOR_STALL = 153; + + //Dispenser 4 motor stalled (Group = Dispensers, Category = Error) + DISPENSER_4_MOTOR_STALL = 154; + + //Dispenser 5 motor stalled (Group = Dispensers, Category = Error) + DISPENSER_5_MOTOR_STALL = 155; + + //Dispenser 6 motor stalled (Group = Dispensers, Category = Error) + DISPENSER_6_MOTOR_STALL = 156; + + //Dispenser 7 motor stalled (Group = Dispensers, Category = Error) + DISPENSER_7_MOTOR_STALL = 157; + + //Dispenser 8 motor stalled (Group = Dispensers, Category = Error) + DISPENSER_8_MOTOR_STALL = 158; + + //Undervoltage in dispenser 1 motor (Group = Dispensers, Category = Error) + DISPENSER_1_MOTOR_UNDERVOLTAGE = 159; + + //Undervoltage in dispenser 2 motor (Group = Dispensers, Category = Error) + DISPENSER_2_MOTOR_UNDERVOLTAGE = 160; + + //Undervoltage in dispenser 3 motor (Group = Dispensers, Category = Error) + DISPENSER_3_MOTOR_UNDERVOLTAGE = 161; + + //Undervoltage in dispenser 4 motor (Group = Dispensers, Category = Error) + DISPENSER_4_MOTOR_UNDERVOLTAGE = 162; + + //Undervoltage in dispenser 5 motor (Group = Dispensers, Category = Error) + DISPENSER_5_MOTOR_UNDERVOLTAGE = 163; + + //Undervoltage in dispenser 6 motor (Group = Dispensers, Category = Error) + DISPENSER_6_MOTOR_UNDERVOLTAGE = 164; + + //Undervoltage in dispenser 7 motor (Group = Dispensers, Category = Error) + DISPENSER_7_MOTOR_UNDERVOLTAGE = 165; + + //Undervoltage in dispenser 8 motor (Group = Dispensers, Category = Error) + DISPENSER_8_MOTOR_UNDERVOLTAGE = 166; + + //Low level in mid-tank 1 (Group = InkDeliverySystem, Category = Warning) + MID_TANK_1_LOW_LEVEL = 167; + + //Low level in mid-tank 2 (Group = InkDeliverySystem, Category = Warning) + MID_TANK_2_LOW_LEVEL = 168; + + //Low level in mid-tank 3 (Group = InkDeliverySystem, Category = Warning) + MID_TANK_3_LOW_LEVEL = 169; + + //Low level in mid-tank 4 (Group = InkDeliverySystem, Category = Warning) + MID_TANK_4_LOW_LEVEL = 170; + + //Low level in mid-tank 5 (Group = InkDeliverySystem, Category = Warning) + MID_TANK_5_LOW_LEVEL = 171; + + //Low level in mid-tank 6 (Group = InkDeliverySystem, Category = Warning) + MID_TANK_6_LOW_LEVEL = 172; + + //Low level in mid-tank 7 (Group = InkDeliverySystem, Category = Warning) + MID_TANK_7_LOW_LEVEL = 173; + + //Low level in mid-tank 8 (Group = InkDeliverySystem, Category = Warning) + MID_TANK_8_LOW_LEVEL = 174; + + //Mid-tank 1 empty (Group = InkDeliverySystem, Category = Error) + MID_TANK_1_EMPTY = 175; + + //Mid-tank 2 empty (Group = InkDeliverySystem, Category = Error) + MID_TANK_2_EMPTY = 176; + + //Mid-tank 3 empty (Group = InkDeliverySystem, Category = Error) + MID_TANK_3_EMPTY = 177; + + //Mid-tank 4 empty (Group = InkDeliverySystem, Category = Error) + MID_TANK_4_EMPTY = 178; + + //Mid-tank 5 empty (Group = InkDeliverySystem, Category = Error) + MID_TANK_5_EMPTY = 179; + + //Mid-tank 6 empty (Group = InkDeliverySystem, Category = Error) + MID_TANK_6_EMPTY = 180; + + //Mid-tank 7 empty (Group = InkDeliverySystem, Category = Error) + MID_TANK_7_EMPTY = 181; + + //Mid-tank 8 empty (Group = InkDeliverySystem, Category = Error) + MID_TANK_8_EMPTY = 182; + + //Overflow in mid-tank 1 (Group = InkDeliverySystem, Category = Warning) + MID_TANK_1_OVERFLOW = 183; + + //Overflow in mid-tank 2 (Group = InkDeliverySystem, Category = Warning) + MID_TANK_2_OVERFLOW = 184; + + //Overflow in mid-tank 3 (Group = InkDeliverySystem, Category = Warning) + MID_TANK_3_OVERFLOW = 185; + + //Overflow in mid-tank 4 (Group = InkDeliverySystem, Category = Warning) + MID_TANK_4_OVERFLOW = 186; + + //Overflow in mid-tank 5 (Group = InkDeliverySystem, Category = Warning) + MID_TANK_5_OVERFLOW = 187; + + //Overflow in mid-tank 6 (Group = InkDeliverySystem, Category = Warning) + MID_TANK_6_OVERFLOW = 188; + + //Overflow in mid-tank 7 (Group = InkDeliverySystem, Category = Warning) + MID_TANK_7_OVERFLOW = 189; + + //Overflow in mid-tank 8 (Group = InkDeliverySystem, Category = Warning) + MID_TANK_8_OVERFLOW = 190; + + //Air filter not present (Group = WasteHandlingSystem, Category = Safety) + AIR_FILTER_NOT_INSTALLED = 191; + + //Air filter clogged (Group = WasteHandlingSystem, Category = Error) + AIR_FILTER_CLOGGED = 192; + + //Waste emptying failure (Group = WasteHandlingSystem, Category = Error) + WASTE_CONTAINER_EMPTYING_TIMEOUT = 193; + + //No air pressure (Group = WasteHandlingSystem, Category = Safety) + NO_AIR_PRESSURE = 194; + + //Overflow in waste container (Group = WasteHandlingSystem, Category = Error) + WASTE_CONTAINER_OVERFLOW = 195; + + // (Group = WasteHandlingSystem, Category = Error) + VOC_SENSOR_ALARM = 196; + + //Chiller malfunction (Group = WasteHandlingSystem, Category = Error) + CHILLER_DRY_CONTACT = 197; + + //Insufficient air flow (Group = WasteHandlingSystem, Category = Error) + INSUFFICIENT_AIR_FLOW = 198; + + //Ink cartridge presence failure (Group = InkFillingSystem, Category = Error) + INK_CARTRIDGE_PRESENCE_SENSOR_TIMEOUT = 199; + + //Ink cartridge identification failure (Group = InkFillingSystem, Category = Error) + INK_CARTRIDGE_RFID_TIMEOUT = 200; + + //No waste cartridge available (Group = InkFillingSystem, Category = Error) + NO_WASTE_CARTRIDGE_AVAILABLE = 201; + + //All waste cartridges are full (Group = InkFillingSystem, Category = Error) + ALL_WASTE_CARTRIDGES_FULL = 202; + + //Waste cartridge presence failure (Group = InkFillingSystem, Category = Error) + WASTE_CARTRIDGE_PRESENCE_SENSOR_TIMEOUT = 203; + + //Waste cartridge identification failure (Group = InkFillingSystem, Category = Error) + WASTE_CARTRIDGE_RFID_TIMEOUT = 204; + + //Electrical cabinet fans RPM too low (Group = ElectricalCabinet, Category = Warning) + ELECTRICAL_CABINET_FANS_RPM_TOO_LOW = 205; + + //Electrical cabinet fans stopped (Group = ElectricalCabinet, Category = Error) + ELECTRICAL_CABINET_FANS_STOPPED = 206; + + //Occurs a request has been sent to the machine or external bridge service (Group = Transport, Category = Info) + REQUEST_SENT = 1000; + + //Occures when a response has been received (Group = Transport, Category = Info) + RESPONSE_RECEIVED = 1001; + + //Occures when a request to the machine has failed (Group = Transport, Category = Error) + REQUEST_FAILED = 1002; + + //Occures when the application has encountered some error (Group = Application, Category = Error) + APPLICATION_EXCEPTION = 1003; + + //General application event logs (Group = Application, Category = Info) + APPLICATION_INFORMATION = 1004; + + //Notifies about application succesfully started (Group = Application, Category = Info) + APPLICATION_STARTED = 1005; + + //Notifies about application termination (Group = Application, Category = Info) + APPLICATION_TERMINATED = 1006; + + //Occures when a diagnostics recording has been started (Group = Application, Category = Info) + RECORDING_STARTED = 1007; + + //Occures when a diagnostics recording has been stopped (Group = Application, Category = Info) + RECORDING_STOPPED = 1008; + + //Occures when a job status message has been received from the embedded device (Group = Application, Category = Info) + JOB_STATUS = 1009; } diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/EventTypeActionsToStringConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/EventTypeActionsToStringConverter.cs deleted file mode 100644 index b33259e3e..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/EventTypeActionsToStringConverter.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Data; -using Tango.BL.Entities; -using Tango.MachineStudio.DB.ViewModels; - -namespace Tango.MachineStudio.DB.Converters -{ - /// - /// Converts an event type action to string representation. - /// - /// - public class EventTypeActionsToStringConverter : IValueConverter - { - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - if (value == null) return ""; - - if (value is IEnumerable) - { - IEnumerable eventActions = value as IEnumerable; - return String.Join(", ", eventActions.Select(x => x.ActionType.Name)); - } - else - { - IEnumerable> eventActions = value as IEnumerable>; - return String.Join(", ", eventActions.Where(x => x.IsSelected).Select(x => x.Entity.Name)); - } - } - - public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) - { - throw new NotImplementedException(); - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj index e719464f8..da427f4d8 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj @@ -80,13 +80,11 @@ - - @@ -96,13 +94,11 @@ - - @@ -132,24 +128,12 @@ - - ActionTypesView.xaml - - - ActionTypeView.xaml - SpoolTypesView.xaml SpoolTypeView.xaml - - EventTypesGroupsView.xaml - - - EventTypesGroupView.xaml - HardwarePidControlTypesView.xaml @@ -354,18 +338,12 @@ OrganizationView.xaml - - EventTypesView.xaml - LiquidTypesRmlsView.xaml UsersView.xaml - - EventTypeView.xaml - LiquidTypesRmlView.xaml @@ -387,14 +365,6 @@ - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - MSBuild:Compile Designer @@ -403,14 +373,6 @@ MSBuild:Compile Designer - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - MSBuild:Compile Designer @@ -683,10 +645,6 @@ MSBuild:Compile Designer - - MSBuild:Compile - Designer - MSBuild:Compile Designer @@ -695,10 +653,6 @@ MSBuild:Compile Designer - - MSBuild:Compile - Designer - MSBuild:Compile Designer @@ -780,7 +734,7 @@ - + \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs index 409b66e12..736682e07 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs @@ -37,8 +37,6 @@ namespace Tango.MachineStudio.DB TangoIOC.Default.Register(); TangoIOC.Default.Register(); - TangoIOC.Default.Register(); - TangoIOC.Default.Register(); TangoIOC.Default.Register(); @@ -62,8 +60,6 @@ namespace Tango.MachineStudio.DB TangoIOC.Default.Register(); TangoIOC.Default.Register(); - TangoIOC.Default.Register(); - TangoIOC.Default.Register(); } @@ -211,22 +207,6 @@ namespace Tango.MachineStudio.DB } } - public static EventTypesViewVM EventTypesViewVM - { - get - { - return TangoIOC.Default.GetInstance(); - } - } - - public static ActionTypesViewVM ActionTypesViewVM - { - get - { - return TangoIOC.Default.GetInstance(); - } - } - public static ContactsViewVM ContactsViewVM { get @@ -379,14 +359,6 @@ namespace Tango.MachineStudio.DB } } - public static EventTypesGroupsViewVM EventTypesGroupsViewVM - { - get - { - return TangoIOC.Default.GetInstance(); - } - } - public static SpoolTypesViewVM SpoolTypesViewVM { get diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ActionTypesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ActionTypesViewVM.cs deleted file mode 100644 index 69092a70d..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ActionTypesViewVM.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; -using Tango.MachineStudio.Common.Notifications; - -namespace Tango.MachineStudio.DB.ViewModels -{ - public class ActionTypesViewVM : DbTableViewModel - { - public ActionTypesViewVM(INotificationProvider notification) : base(notification) - { - - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesGroupsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesGroupsViewVM.cs deleted file mode 100644 index abdb00e32..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesGroupsViewVM.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; -using Tango.MachineStudio.Common.Notifications; - -namespace Tango.MachineStudio.DB.ViewModels -{ - public class EventTypesGroupsViewVM : DbTableViewModel - { - public EventTypesGroupsViewVM(INotificationProvider notification) : base(notification) - { - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesViewVM.cs deleted file mode 100644 index 6702b720f..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesViewVM.cs +++ /dev/null @@ -1,71 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; -using Tango.MachineStudio.Common.Notifications; - -namespace Tango.MachineStudio.DB.ViewModels -{ - public class EventTypesViewVM : DbTableViewModel - { - public EventTypesViewVM(INotificationProvider notification) : base(notification) - { - SelectedActions = new ObservableCollection>(); - } - - private ObservableCollection> _selectedActions; - public ObservableCollection> SelectedActions - { - get { return _selectedActions; } - set { _selectedActions = value; RaisePropertyChangedAuto(); } - } - - protected override void OnEdit() - { - SelectedActions = Adapter.ActionTypes.Select(x => new MultiComboVM(x, () => RaisePropertyChanged(nameof(SelectedActions)))).ToObservableCollection(); - - foreach (var actionType in SelectedActions) - { - if (SelectedEntity.EventTypesActions.ToList().Exists(x => x.ActionType == actionType.Entity)) - { - actionType.IsSelected = true; - } - } - - base.OnEdit(); - } - - protected override void OnAdd() - { - SelectedActions = Adapter.ActionTypes.Select(x => new MultiComboVM(x, () => RaisePropertyChanged(nameof(SelectedActions)))).ToObservableCollection(); - - base.OnAdd(); - } - - protected override void OnBeforeEntitySave(DialogOpenMode mode, EventType eventType) - { - base.OnBeforeEntitySave(mode, eventType); - - - - Adapter.Context.EventTypesActions.RemoveRange(eventType.EventTypesActions); - - foreach (var actionType in SelectedActions) - { - if (actionType.IsSelected) - { - eventType.EventTypesActions.Add(new EventTypesAction() - { - ActionType = actionType.Entity, - EventType = eventType, - ActionTypeGuid = actionType.Entity.Guid, - EventTypeGuid = eventType.Guid - }); - } - } - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypeView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypeView.xaml deleted file mode 100644 index 11a472edb..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypeView.xaml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypeView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypeView.xaml.cs deleted file mode 100644 index 05a56fb89..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypeView.xaml.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; - -namespace Tango.MachineStudio.DB.Views.DBViews -{ - /// - /// Interaction logic for MachineView.xaml - /// - public partial class ActionTypeView : UserControl - { - public ActionTypeView() - { - InitializeComponent(); - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypesView.xaml deleted file mode 100644 index a9a14fb0c..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypesView.xaml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypesView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypesView.xaml.cs deleted file mode 100644 index aad79c87a..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/ActionTypesView.xaml.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; -using Tango.MachineStudio.DB.CustomAttributes; -using Tango.MachineStudio.DB.Managers; -using Tango.SharedUI.Controls; - -namespace Tango.MachineStudio.DB.Views.DBViews -{ - /// - /// Interaction logic for MachinesView.xaml - /// - [DBView] - public partial class ActionTypesView : UserControl - { - public ActionTypesView() : base() - { - InitializeComponent(); - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypeView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypeView.xaml deleted file mode 100644 index 4c1111ed7..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypeView.xaml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypeView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypeView.xaml.cs deleted file mode 100644 index 6294b14e7..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypeView.xaml.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; - -namespace Tango.MachineStudio.DB.Views.DBViews -{ - /// - /// Interaction logic for UserView.xaml - /// - public partial class EventTypeView : UserControl - { - public EventTypeView() - { - InitializeComponent(); - } - - private void comboRoles_SelectionChanged(object sender, SelectionChangedEventArgs e) - { - comboActions.SelectedItem = null; - comboActions.Text = "Press to select"; - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupView.xaml deleted file mode 100644 index 8f8ec1eae..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupView.xaml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupView.xaml.cs deleted file mode 100644 index e164fa171..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupView.xaml.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; - -namespace Tango.MachineStudio.DB.Views.DBViews -{ - /// - /// Interaction logic for UserView.xaml - /// - public partial class EventTypesGroupView : UserControl - { - public EventTypesGroupView() - { - InitializeComponent(); - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupsView.xaml deleted file mode 100644 index e6dff7f8a..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupsView.xaml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupsView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupsView.xaml.cs deleted file mode 100644 index c11aeccc4..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesGroupsView.xaml.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; -using Tango.MachineStudio.DB.CustomAttributes; - -namespace Tango.MachineStudio.DB.Views.DBViews -{ - /// - /// Interaction logic for UsersView.xaml - /// - [DBView] - public partial class EventTypesGroupsView : UserControl - { - public EventTypesGroupsView() - { - InitializeComponent(); - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesView.xaml deleted file mode 100644 index 19700c976..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesView.xaml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesView.xaml.cs deleted file mode 100644 index 3c197b7f2..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/EventTypesView.xaml.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; -using Tango.MachineStudio.DB.CustomAttributes; - -namespace Tango.MachineStudio.DB.Views.DBViews -{ - /// - /// Interaction logic for UsersView.xaml - /// - [DBView] - public partial class EventTypesView : UserControl - { - public EventTypesView() - { - InitializeComponent(); - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/ViewModels/MainViewVM.cs index 9876dca9e..3d282367a 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/ViewModels/MainViewVM.cs @@ -377,7 +377,7 @@ namespace Tango.MachineStudio.DataCapture.ViewModels using (_notification.PushTaskItem("Starting Recording...")) { Recorder.Start(); - _eventLogger.Log(EventTypes.RecordingStarted, "Recording Started..."); + _eventLogger.Log(EventTypes.RECORDING_STARTED, "Recording Started..."); _recordingBarItem.Push(); } @@ -393,7 +393,7 @@ namespace Tango.MachineStudio.DataCapture.ViewModels await Recorder.Stop(); _recordingBarItem.Pop(); - _eventLogger.Log(EventTypes.RecordingStopped, "Recording Stopped..."); + _eventLogger.Log(EventTypes.RECORDING_STOPPED, "Recording Stopped..."); } String recordingName = _notification.ShowTextInput("Enter recording name", "Recording name"); diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs index 8b0a89336..8ac8e6acd 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs @@ -738,8 +738,8 @@ namespace Tango.MachineStudio.Developer.ViewModels RemoveBrushStopCommand = new RelayCommand(RemoveSelectedBrushStops, () => SelectedBrushStop != null && CanWork); SaveJobCommand = new RelayCommand(SaveActiveJob, () => SelectedMachine != null && CanWork); DiscardJobCommand = new RelayCommand(BackToJobs, () => SelectedMachine != null && CanWork); - StartJobCommand = new RelayCommand(() => StartJob(), () => ActiveJob != null && CanWork && !IsJobRunning && MachineOperator != null && !MachineOperator.MachineEventsStateProvider.Events.ToList().Exists(x => x.ActionTypes.Contains(BL.Enumerations.ActionTypes.PreventJobExecution))); - StartJobAndRecordCommand = new RelayCommand(StartJobAndRecord, () => _dataCaptureVM != null && !_dataCaptureVM.Recorder.IsRecording && !_dataCaptureVM.Player.IsPlaying && ActiveJob != null && !IsJobRunning && MachineOperator != null && !MachineOperator.MachineEventsStateProvider.Events.ToList().Exists(x => x.ActionTypes.Contains(BL.Enumerations.ActionTypes.PreventJobExecution))); + StartJobCommand = new RelayCommand(() => StartJob(), () => ActiveJob != null && CanWork && !IsJobRunning && MachineOperator != null && !MachineOperator.MachineEventsStateProvider.Events.ToList().Exists(x => x.Actions.Contains(BL.Enumerations.EventTypeActions.PreventJob))); + StartJobAndRecordCommand = new RelayCommand(StartJobAndRecord, () => _dataCaptureVM != null && !_dataCaptureVM.Recorder.IsRecording && !_dataCaptureVM.Player.IsPlaying && ActiveJob != null && !IsJobRunning && MachineOperator != null && !MachineOperator.MachineEventsStateProvider.Events.ToList().Exists(x => x.Actions.Contains(BL.Enumerations.EventTypeActions.PreventJob))); StopJobCommand = new RelayCommand(StopJob, () => IsJobRunning && CanWork); CloseJobCompletionStatusCommand = new RelayCommand(CloseJobCompletionStatusBar); LoadJobCommand = new RelayCommand(() => LoadSelectedJob(), () => SelectedMachineJob != null && CanWork); @@ -1052,7 +1052,7 @@ namespace Tango.MachineStudio.Developer.ViewModels { _speech.SpeakError(events.Last().EventType.Name); - if (events.ToList().Exists(x => x.ActionTypes.Contains(BL.Enumerations.ActionTypes.AbortRunningJob))) + if (events.ToList().Exists(x => x.Actions.Contains(BL.Enumerations.EventTypeActions.StopJob))) { if (JobHandler != null) { @@ -1209,7 +1209,7 @@ namespace Tango.MachineStudio.Developer.ViewModels private void OnSelectedJobEventChanged() { - if (SelectedJobEvent != null && SelectedJobEvent.Type != BL.Enumerations.EventTypes.ApplicationStarted && !_dialog_shown) + if (SelectedJobEvent != null && SelectedJobEvent.Type != BL.Enumerations.EventTypes.APPLICATION_STARTED && !_dialog_shown) { _dialog_shown = true; _notification.ShowModalDialog(new EventDetailsViewVM(SelectedJobEvent), (x) => @@ -1333,7 +1333,7 @@ namespace Tango.MachineStudio.Developer.ViewModels if (status.Message != null) { // TODO: Write to db when shlomo is not sending test messages anymore. - _eventLogger.Log(BL.Enumerations.EventTypes.JobStatus, status.Message, false); + _eventLogger.Log(BL.Enumerations.EventTypes.JOB_STATUS, status.Message, false); } } }; diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs index 1f93a96dc..c813e9752 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs @@ -140,8 +140,6 @@ namespace Tango.MachineStudio.Logging.ViewModels _db = ObservablesContext.CreateDefault(); _db.EventTypes.Load(); - _db.EventTypesCategories.Load(); - _db.EventTypesGroups.Load(); DateTime now = DateTime.UtcNow.AddMonths(-1); @@ -183,7 +181,7 @@ namespace Tango.MachineStudio.Logging.ViewModels private void OnSelectedEventChanged() { - if (SelectedEvent != null && SelectedEvent.Type != BL.Enumerations.EventTypes.ApplicationStarted && !_dialog_shown) + if (SelectedEvent != null && SelectedEvent.Type != BL.Enumerations.EventTypes.APPLICATION_STARTED && !_dialog_shown) { _dialog_shown = true; _notification.ShowModalDialog(new EventDetailsViewVM(SelectedEvent), (x) => @@ -198,7 +196,7 @@ namespace Tango.MachineStudio.Logging.ViewModels private void DisplayTimeline(MachinesEvent ev) { - var events = Events.OrderBy(x => x.DateTime).SkipWhile(x => x != ev).Skip(1).TakeWhile(x => x.DateTime > ev.DateTime && x.Type != BL.Enumerations.EventTypes.ApplicationStarted).ToObservableCollection(); + var events = Events.OrderBy(x => x.DateTime).SkipWhile(x => x != ev).Skip(1).TakeWhile(x => x.DateTime > ev.DateTime && x.Type != BL.Enumerations.EventTypes.APPLICATION_STARTED).ToObservableCollection(); events.Insert(0, ev); TimelineViewVM.Initialize(events.ToList()); diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventDetailsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventDetailsView.xaml index c75ef41ee..2dda7d342 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventDetailsView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventDetailsView.xaml @@ -73,9 +73,9 @@ - + - + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventsView.xaml index 196b6f930..846ea1fe2 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventsView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventsView.xaml @@ -136,7 +136,7 @@ - + @@ -154,7 +154,7 @@ - + @@ -188,7 +188,7 @@ - + @@ -202,7 +202,7 @@ - + @@ -219,7 +219,7 @@ - - -
Thread Break
-
    -
  1. Open the cover.
    2. -
  2. Connect the broken thread.
    3. -
  3. Close the cover.
    4. -
  4. Press 'OK' when done.
    5. -
- - \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HtmlWindow.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HtmlWindow.xaml deleted file mode 100644 index f984a985f..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HtmlWindow.xaml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HtmlWindow.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HtmlWindow.xaml.cs deleted file mode 100644 index 9f37eba06..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Html/HtmlWindow.xaml.cs +++ /dev/null @@ -1,48 +0,0 @@ -using MahApps.Metro.Controls; -using MaterialDesignThemes.Wpf; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Shapes; -using Tango.BL.Entities; -using Tango.Core.Commands; - -namespace Tango.MachineStudio.UI.Html -{ - /// - /// Interaction logic for DialogWindow.xaml - /// - public partial class HtmlWindow : Window - { - public HtmlWindow(HtmlPage html) - { - InitializeComponent(); - - webBrowser.Loaded += (_, __) => - { - webBrowser.NavigateToString(html.Html); - }; - } - - private void OKClicked(object sender, RoutedEventArgs e) - { - DialogResult = true; - Close(); - } - - private void CloseClicked(object sender, RoutedEventArgs e) - { - DialogResult = false; - Close(); - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs index baa550017..1612eb36c 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs @@ -265,7 +265,7 @@ namespace Tango.MachineStudio.UI.StudioApplication var eventLogger = TangoIOC.Default.GetInstance(); if (eventLogger != null) { - eventLogger.Log(EventTypes.ApplicationTerminated, "Application Terminated!"); + eventLogger.Log(EventTypes.APPLICATION_TERMINATED, "Application Terminated!"); eventLogger.FlushAll(); } diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj index fb84d64bd..706b1c8f7 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj @@ -144,10 +144,6 @@ - - - HtmlWindow.xaml - @@ -243,10 +239,6 @@ Designer MSBuild:Compile - - MSBuild:Compile - Designer - MSBuild:Compile Designer @@ -536,7 +528,6 @@ Tango.Embroidery.dll PreserveNewest - @@ -618,7 +609,7 @@ copy /Y "$(SolutionDir)Referenced Assemblies\Microsoft.WITDataStore32.dll" "$(Ta - + \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs index 3c548855d..b0a3a8c11 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs @@ -7,7 +7,6 @@ using Tango.MachineStudio.Common.Authentication; using Tango.MachineStudio.Common.Diagnostics; using Tango.MachineStudio.Common.EventLogging; using Tango.MachineStudio.Common.FirmwareUpgrade; -using Tango.MachineStudio.Common.Html; using Tango.MachineStudio.Common.Modules; using Tango.MachineStudio.Common.Navigation; using Tango.MachineStudio.Common.Notifications; @@ -18,7 +17,6 @@ using Tango.MachineStudio.Common.Video; using Tango.MachineStudio.UI.Authentication; using Tango.MachineStudio.UI.Console; using Tango.MachineStudio.UI.FirmwareUpgrade; -using Tango.MachineStudio.UI.Html; using Tango.MachineStudio.UI.Modules; using Tango.MachineStudio.UI.Navigation; using Tango.MachineStudio.UI.Notifications; @@ -67,7 +65,6 @@ namespace Tango.MachineStudio.UI TangoIOC.Default.Unregister(); TangoIOC.Default.Unregister(); TangoIOC.Default.Unregister(); - TangoIOC.Default.Unregister(); TangoIOC.Default.Unregister(); TangoIOC.Default.Unregister(); TangoIOC.Default.Unregister(); @@ -84,7 +81,6 @@ namespace Tango.MachineStudio.UI TangoIOC.Default.Register(); TangoIOC.Default.Register(); TangoIOC.Default.Register(); - TangoIOC.Default.Register(); TangoIOC.Default.Register(); TangoIOC.Default.Register(new TeamFoundationServiceExtendedClient("https://twinetfs.visualstudio.com", String.Empty, "szzfokrceo4rhd4eqi5qpmxn3pa5iwl3q7tlqd36l2m7smz2ynoa")); diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs index 492e23963..4ebf3d96d 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoginViewVM.cs @@ -141,7 +141,7 @@ namespace Tango.MachineStudio.UI.ViewModels _authenticationProvider.Login(Email, Password); - _eventLogger.Log(EventTypes.ApplicationStarted, "Application Started!"); + _eventLogger.Log(EventTypes.APPLICATION_STARTED, "Application Started!"); _navigationManager.NavigateTo(NavigationView.MainView); diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs index e3a8b4e7c..c13c7379a 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs @@ -20,7 +20,6 @@ using Tango.MachineStudio.Common; using Tango.MachineStudio.Common.Authentication; using Tango.MachineStudio.Common.Diagnostics; using Tango.MachineStudio.Common.EventLogging; -using Tango.MachineStudio.Common.Html; using Tango.MachineStudio.Common.Messages; using Tango.MachineStudio.Common.Modules; using Tango.MachineStudio.Common.Navigation; @@ -54,7 +53,6 @@ namespace Tango.MachineStudio.UI.ViewModels private bool _isDisconnecting; private Thread _updateCheckThread; private IEventLogger _eventLogger; - private IHtmlPresenter _htmlPresenter; private MachineStudioSettings _settings; /// @@ -282,7 +280,7 @@ namespace Tango.MachineStudio.UI.ViewModels IEventLogger eventLogger, IDiagnosticsFrameProvider frameProvider, ISpeechProvider speechProvider, - IHtmlPresenter htmlPresenter, TeamFoundationServiceExtendedClient tfs) : base() + TeamFoundationServiceExtendedClient tfs) : base() { TFSClient = tfs; _eventLogger = eventLogger; @@ -293,7 +291,6 @@ namespace Tango.MachineStudio.UI.ViewModels ApplicationManager = applicationManager; DiagnosticsFrameProvider = frameProvider; SpeechProvider = speechProvider; - _htmlPresenter = htmlPresenter; _settings = SettingsManager.Default.GetOrCreate(); @@ -782,21 +779,7 @@ namespace Tango.MachineStudio.UI.ViewModels /// The HTML page. private async void ResolveMachineEvent(MachinesEvent machineEvent) { - if (machineEvent.EventType.HtmlPage != null) - { - if (_htmlPresenter.DisplayHtml(machineEvent.EventType.HtmlPage)) - { - if (ApplicationManager.ConnectedMachine != null && machineEvent.EventType.Resolvable) - { - _eventLogger.Log(String.Format("Event '{0}' resolved by user.", machineEvent.EventType.Name)); - await ApplicationManager.ConnectedMachine.ResolveEvent((PMR.Diagnostics.EventType)machineEvent.Type); - } - } - } - else - { - _notificationProvider.ShowWarning("Could not locate guidance content for the specified event."); - } + } /// diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/ViewModels/MainViewVM.cs index 81b6e5942..dd8b8041d 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/ViewModels/MainViewVM.cs @@ -60,11 +60,11 @@ namespace Tango.PPC.Events.ViewModels { InvokeUI(() => { - if (ev.Group != EventTypesGroups.Transport) + if (ev.Group != EventTypeGroups.Transport) { CurrentEvents.Insert(0, ev); - if (ev.Group != EventTypesGroups.Application && ev.Group != EventTypesGroups.Transport) + if (ev.Group != EventTypeGroups.Application && ev.Group != EventTypeGroups.Transport) { var notificationItem = new MessageNotificationItem(); notificationItem.CanClose = false; @@ -78,16 +78,16 @@ namespace Tango.PPC.Events.ViewModels switch (ev.Category) { - case EventTypesCategories.Info: + case EventTypeCategories.Info: notificationItem.MessageType = MessageNotificationItem.MessageNotificationItemTypes.Info; break; - case EventTypesCategories.Warning: + case EventTypeCategories.Warning: notificationItem.MessageType = MessageNotificationItem.MessageNotificationItemTypes.Warning; break; - case EventTypesCategories.Error: + case EventTypeCategories.Error: notificationItem.MessageType = MessageNotificationItem.MessageNotificationItemTypes.Error; break; - case EventTypesCategories.Critical: + case EventTypeCategories.Critical: notificationItem.MessageType = MessageNotificationItem.MessageNotificationItemTypes.Critical; break; } @@ -103,11 +103,11 @@ namespace Tango.PPC.Events.ViewModels { InvokeUI(() => { - if (ev.Group != EventTypesGroups.Transport) + if (ev.Group != EventTypeGroups.Transport) { CurrentEvents.Remove(ev); - if (ev.Group != EventTypesGroups.Application && ev.Group != EventTypesGroups.Transport) + if (ev.Group != EventTypeGroups.Application && ev.Group != EventTypeGroups.Transport) { if (_notifications.ContainsKey(ev.EventType.Type)) { diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/EventLogging/DefaultEventLogger.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/EventLogging/DefaultEventLogger.cs index 5162bc532..8e1f7c722 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/EventLogging/DefaultEventLogger.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/EventLogging/DefaultEventLogger.cs @@ -88,10 +88,6 @@ namespace Tango.PPC.Common.EventLogging { _db = ObservablesContext.CreateDefault(); - _db.ActionTypes.ToList(); - _db.EventTypesActions.ToList(); - _db.EventTypesCategories.ToList(); - _db.EventTypesGroups.ToList(); _db.EventTypes.ToList(); foreach (var type in _db.EventTypes) @@ -143,7 +139,7 @@ namespace Tango.PPC.Common.EventLogging /// The message. private void Machine_RequestSent(object sender, IMessage message) { - Log(EventTypes.RequestSent, String.Format("Sending request '{0}'...{1}{2}", message.GetType().Name, Environment.NewLine, message.ToJsonString())); + Log(EventTypes.REQUEST_SENT, String.Format("Sending request '{0}'...{1}{2}", message.GetType().Name, Environment.NewLine, message.ToJsonString())); } /// @@ -153,7 +149,7 @@ namespace Tango.PPC.Common.EventLogging /// The instance containing the event data. private void Machine_RequestFailed(object sender, RequestFailedEventArgs e) { - Log(EventTypes.RequestFailed, String.Format("Request failed '{0}'...{1}{2}{1}{3}", e.Message.GetType().Name, Environment.NewLine, e.Message.ToJsonString(), e.Exception.ToString())); + Log(EventTypes.REQUEST_FAILED, String.Format("Request failed '{0}'...{1}{2}{1}{3}", e.Message.GetType().Name, Environment.NewLine, e.Message.ToJsonString(), e.Exception.ToString())); } /// @@ -163,7 +159,7 @@ namespace Tango.PPC.Common.EventLogging /// The message. private void Machine_ResponseReceived(object sender, IMessage message) { - Log(EventTypes.ResponseReceived, String.Format("Response received '{0}'...{1}{2}", message.GetType().Name, Environment.NewLine, message.ToJsonString())); + Log(EventTypes.RESPONSE_RECEIVED, String.Format("Response received '{0}'...{1}{2}", message.GetType().Name, Environment.NewLine, message.ToJsonString())); } /// @@ -273,7 +269,7 @@ namespace Tango.PPC.Common.EventLogging /// The exception. public void Log(Exception exception) { - Log(EventTypes.ApplicationException, exception.ToString()); + Log(EventTypes.APPLICATION_EXCEPTION, exception.ToString()); } /// @@ -283,7 +279,7 @@ namespace Tango.PPC.Common.EventLogging /// public void Log(Exception exception, string description) { - Log(EventTypes.ApplicationException, description + Environment.NewLine + exception.ToString()); + Log(EventTypes.APPLICATION_EXCEPTION, description + Environment.NewLine + exception.ToString()); } /// @@ -292,7 +288,7 @@ namespace Tango.PPC.Common.EventLogging /// The message. public void Log(String message) { - Log(EventTypes.ApplicationInformation, message); + Log(EventTypes.APPLICATION_INFORMATION, message); } /// diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs index f9830940b..3916d6345 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs @@ -216,7 +216,7 @@ namespace Tango.PPC.UI.PPCApplication { LogManager.Log($"Raising {nameof(ApplicationStarted)} event..."); - _eventLogger.Log(EventTypes.ApplicationStarted, "Application Started!"); + _eventLogger.Log(EventTypes.APPLICATION_STARTED, "Application Started!"); ApplicationStarted?.Invoke(this, new EventArgs()); LogManager.Log("Invoking PPC view models OnApplicationStarted methods..."); diff --git a/Software/Visual_Studio/Resources/Events-old-old.xlsx b/Software/Visual_Studio/Resources/Events-old-old.xlsx new file mode 100644 index 000000000..53aa042a2 Binary files /dev/null and b/Software/Visual_Studio/Resources/Events-old-old.xlsx differ diff --git a/Software/Visual_Studio/Resources/Events-old.xlsx b/Software/Visual_Studio/Resources/Events-old.xlsx new file mode 100644 index 000000000..99d2c4a5c Binary files /dev/null and b/Software/Visual_Studio/Resources/Events-old.xlsx differ diff --git a/Software/Visual_Studio/Resources/Events.xlsx b/Software/Visual_Studio/Resources/Events.xlsx index 99d2c4a5c..da9110f8b 100644 Binary files a/Software/Visual_Studio/Resources/Events.xlsx and b/Software/Visual_Studio/Resources/Events.xlsx differ diff --git a/Software/Visual_Studio/Tango.BL/Entities/ActionType.cs b/Software/Visual_Studio/Tango.BL/Entities/ActionType.cs deleted file mode 100644 index a5f6f9f4d..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/ActionType.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.Entities -{ - public partial class ActionType : ActionTypeBase - { - /// - /// Initializes a new instance of the class. - /// - public ActionType() : base() - { - - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/ActionTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ActionTypeBase.cs deleted file mode 100644 index 48357ed4d..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/ActionTypeBase.cs +++ /dev/null @@ -1,188 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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! -// -//------------------------------------------------------------------------------ - -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; - -namespace Tango.BL.Entities -{ - [Table("ACTION_TYPES")] - public abstract class ActionTypeBase : ObservableEntity - { - - public event EventHandler CodeChanged; - - public event EventHandler NameChanged; - - public event EventHandler DescriptionChanged; - - public event EventHandler> EventTypesActionsChanged; - - protected Int32 _code; - - /// - /// Gets or sets the actiontypebase code. - /// - - [Column("CODE")] - - public Int32 Code - { - get - { - return _code; - } - - set - { - if (_code != value) - { - _code = value; - - OnCodeChanged(value); - - } - } - } - - protected String _name; - - /// - /// Gets or sets the actiontypebase name. - /// - - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - if (_name != value) - { - _name = value; - - OnNameChanged(value); - - } - } - } - - protected String _description; - - /// - /// Gets or sets the actiontypebase description. - /// - - [Column("DESCRIPTION")] - - public String Description - { - get - { - return _description; - } - - set - { - if (_description != value) - { - _description = value; - - OnDescriptionChanged(value); - - } - } - } - - protected SynchronizedObservableCollection _eventtypesactions; - - /// - /// Gets or sets the actiontypebase event types actions. - /// - - public virtual SynchronizedObservableCollection EventTypesActions - { - get - { - return _eventtypesactions; - } - - set - { - if (_eventtypesactions != value) - { - _eventtypesactions = value; - - OnEventTypesActionsChanged(value); - - } - } - } - - /// - /// Called when the Code has changed. - /// - protected virtual void OnCodeChanged(Int32 code) - { - CodeChanged?.Invoke(this, code); - RaisePropertyChanged(nameof(Code)); - } - - /// - /// Called when the Name has changed. - /// - protected virtual void OnNameChanged(String name) - { - NameChanged?.Invoke(this, name); - RaisePropertyChanged(nameof(Name)); - } - - /// - /// Called when the Description has changed. - /// - protected virtual void OnDescriptionChanged(String description) - { - DescriptionChanged?.Invoke(this, description); - RaisePropertyChanged(nameof(Description)); - } - - /// - /// Called when the EventTypesActions has changed. - /// - protected virtual void OnEventTypesActionsChanged(SynchronizedObservableCollection eventtypesactions) - { - EventTypesActionsChanged?.Invoke(this, eventtypesactions); - RaisePropertyChanged(nameof(EventTypesActions)); - } - - /// - /// Initializes a new instance of the class. - /// - public ActionTypeBase() : base() - { - - EventTypesActions = new SynchronizedObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/DispenserBase.cs b/Software/Visual_Studio/Tango.BL/Entities/DispenserBase.cs index 91d84a666..591ae2155 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/DispenserBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/DispenserBase.cs @@ -29,7 +29,15 @@ namespace Tango.BL.Entities public event EventHandler NlPerPulseChanged; - public event EventHandler DataChanged; + public event EventHandler PartNumberChanged; + + public event EventHandler PcbSerialChanged; + + public event EventHandler PcbVersionChanged; + + public event EventHandler> ProductionDateChanged; + + public event EventHandler CalibrationDataChanged; public event EventHandler DispenserTypeChanged; @@ -114,28 +122,136 @@ namespace Tango.BL.Entities } } - protected Byte[] _data; + protected String _partnumber; + + /// + /// Gets or sets the dispenserbase part number. + /// + + [Column("PART_NUMBER")] + + public String PartNumber + { + get + { + return _partnumber; + } + + set + { + if (_partnumber != value) + { + _partnumber = value; + + OnPartNumberChanged(value); + + } + } + } + + protected String _pcbserial; + + /// + /// Gets or sets the dispenserbase pcb serial. + /// + + [Column("PCB_SERIAL")] + + public String PcbSerial + { + get + { + return _pcbserial; + } + + set + { + if (_pcbserial != value) + { + _pcbserial = value; + + OnPcbSerialChanged(value); + + } + } + } + + protected String _pcbversion; + + /// + /// Gets or sets the dispenserbase pcb version. + /// + + [Column("PCB_VERSION")] + + public String PcbVersion + { + get + { + return _pcbversion; + } + + set + { + if (_pcbversion != value) + { + _pcbversion = value; + + OnPcbVersionChanged(value); + + } + } + } + + protected Nullable _productiondate; + + /// + /// Gets or sets the dispenserbase production date. + /// + + [Column("PRODUCTION_DATE")] + + public Nullable ProductionDate + { + get + { + return _productiondate; + } + + set + { + if (_productiondate != value) + { + _productiondate = value; + + OnProductionDateChanged(value); + + } + } + } + + protected Byte[] _calibrationdata; /// - /// Gets or sets the dispenserbase data. + /// Gets or sets the dispenserbase calibration data. /// - [Column("DATA")] + [Column("CALIBRATION_DATA")] - public Byte[] Data + public Byte[] CalibrationData { get { - return _data; + return _calibrationdata; } set { - if (_data != value) + if (_calibrationdata != value) { - _data = value; + _calibrationdata = value; - OnDataChanged(value); + OnCalibrationDataChanged(value); } } @@ -212,12 +328,48 @@ namespace Tango.BL.Entities } /// - /// Called when the Data has changed. + /// Called when the PartNumber has changed. + /// + protected virtual void OnPartNumberChanged(String partnumber) + { + PartNumberChanged?.Invoke(this, partnumber); + RaisePropertyChanged(nameof(PartNumber)); + } + + /// + /// Called when the PcbSerial has changed. + /// + protected virtual void OnPcbSerialChanged(String pcbserial) + { + PcbSerialChanged?.Invoke(this, pcbserial); + RaisePropertyChanged(nameof(PcbSerial)); + } + + /// + /// Called when the PcbVersion has changed. + /// + protected virtual void OnPcbVersionChanged(String pcbversion) + { + PcbVersionChanged?.Invoke(this, pcbversion); + RaisePropertyChanged(nameof(PcbVersion)); + } + + /// + /// Called when the ProductionDate has changed. + /// + protected virtual void OnProductionDateChanged(Nullable productiondate) + { + ProductionDateChanged?.Invoke(this, productiondate); + RaisePropertyChanged(nameof(ProductionDate)); + } + + /// + /// Called when the CalibrationData has changed. /// - protected virtual void OnDataChanged(Byte[] data) + protected virtual void OnCalibrationDataChanged(Byte[] calibrationdata) { - DataChanged?.Invoke(this, data); - RaisePropertyChanged(nameof(Data)); + CalibrationDataChanged?.Invoke(this, calibrationdata); + RaisePropertyChanged(nameof(CalibrationData)); } /// diff --git a/Software/Visual_Studio/Tango.BL/Entities/EventType.cs b/Software/Visual_Studio/Tango.BL/Entities/EventType.cs index 0c1e9fa76..e6e63d616 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/EventType.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/EventType.cs @@ -19,6 +19,52 @@ namespace Tango.BL.Entities set { Code = (int)value; } } + [NotMapped] + [JsonIgnore] + public EventTypeCategories Category + { + get { return (EventTypeCategories)EventCategory; } + set { EventCategory = value.ToInt32(); } + } + + [NotMapped] + [JsonIgnore] + public EventTypeGroups Group + { + get { return (EventTypeGroups)EventGroup; } + set { EventGroup = value.ToInt32(); } + } + + [NotMapped] + [JsonIgnore] + public EventTypeNotificationTimes NotificationTime + { + get { return (EventTypeNotificationTimes)EventNotificationTime; } + set { EventNotificationTime = value.ToInt32(); } + } + + [NotMapped] + [JsonIgnore] + public List Actions + { + get + { + try + { + return EventActions.ToEnumValues(','); + } + catch (Exception ex) + { + LogManager.Log(ex, "Could not parse event type action types!"); + return new List(); + } + } + set + { + EventActions = String.Join(",", value.Select(x => x.ToInt32())); + } + } + /// /// Initializes a new instance of the class. /// diff --git a/Software/Visual_Studio/Tango.BL/Entities/EventTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/EventTypeBase.cs index 751309db8..bd5d39536 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/EventTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/EventTypeBase.cs @@ -21,6 +21,11 @@ using Tango.Core; namespace Tango.BL.Entities { + + /// + /// + /// + [Table("EVENT_TYPES")] public abstract class EventTypeBase : ObservableEntity { @@ -29,19 +34,23 @@ namespace Tango.BL.Entities public event EventHandler NameChanged; + public event EventHandler TitleChanged; + public event EventHandler DescriptionChanged; - public event EventHandler RequiresUserInterventionChanged; + public event EventHandler TechnicalDescriptionChanged; + + public event EventHandler ComponentIndexChanged; - public event EventHandler ResolvableChanged; + public event EventHandler EventCategoryChanged; - public event EventHandler EventTypesGroupChanged; + public event EventHandler EventGroupChanged; - public event EventHandler EventTypesCategoryChanged; + public event EventHandler EventNotificationTimeChanged; - public event EventHandler HtmlPageChanged; + public event EventHandler EventActionsChanged; - public event EventHandler> EventTypesActionsChanged; + public event EventHandler RequiresUserInterventionChanged; public event EventHandler> MachinesEventsChanged; @@ -99,263 +108,264 @@ namespace Tango.BL.Entities } } - protected String _description; + protected String _title; /// - /// Gets or sets the eventtypebase description. + /// Gets or sets the eventtypebase title. /// - [Column("DESCRIPTION")] + [Column("TITLE")] - public String Description + public String Title { get { - return _description; + return _title; } set { - if (_description != value) + if (_title != value) { - _description = value; + _title = value; - OnDescriptionChanged(value); + OnTitleChanged(value); } } } - protected String _eventtypescategoryguid; + protected String _description; /// - /// Gets or sets the eventtypebase event types category guid. + /// Gets or sets the eventtypebase description. /// - [Column("EVENT_TYPES_CATEGORY_GUID")] - [ForeignKey("EventTypesCategory")] + [Column("DESCRIPTION")] - public String EventTypesCategoryGuid + public String Description { get { - return _eventtypescategoryguid; + return _description; } set { - if (_eventtypescategoryguid != value) + if (_description != value) { - _eventtypescategoryguid = value; - } - } - } - - protected String _eventtypesgroupguid; - - /// - /// Gets or sets the eventtypebase event types group guid. - /// - - [Column("EVENT_TYPES_GROUP_GUID")] - [ForeignKey("EventTypesGroup")] + _description = value; - public String EventTypesGroupGuid - { - get - { - return _eventtypesgroupguid; - } + OnDescriptionChanged(value); - set - { - if (_eventtypesgroupguid != value) - { - _eventtypesgroupguid = value; } } } - protected Boolean _requiresuserintervention; + protected String _technicaldescription; /// - /// Gets or sets the eventtypebase requires user intervention. + /// Gets or sets the eventtypebase technical description. /// - [Column("REQUIRES_USER_INTERVENTION")] + [Column("TECHNICAL_DESCRIPTION")] - public Boolean RequiresUserIntervention + public String TechnicalDescription { get { - return _requiresuserintervention; + return _technicaldescription; } set { - if (_requiresuserintervention != value) + if (_technicaldescription != value) { - _requiresuserintervention = value; + _technicaldescription = value; - OnRequiresUserInterventionChanged(value); + OnTechnicalDescriptionChanged(value); } } } - protected String _htmlpageguid; + protected Int32 _componentindex; /// - /// Gets or sets the eventtypebase html page guid. + /// Gets or sets the eventtypebase component index. /// - [Column("HTML_PAGE_GUID")] - [ForeignKey("HtmlPage")] + [Column("COMPONENT_INDEX")] - public String HtmlPageGuid + public Int32 ComponentIndex { get { - return _htmlpageguid; + return _componentindex; } set { - if (_htmlpageguid != value) + if (_componentindex != value) { - _htmlpageguid = value; + _componentindex = value; + + OnComponentIndexChanged(value); + } } } - protected Boolean _resolvable; + protected Int32 _eventcategory; /// - /// Gets or sets the eventtypebase resolvable. + /// 0 = Info + /// 1 = Warning + /// 2 = Error + /// 3 = Critical + /// 4 = Safety /// - [Column("RESOLVABLE")] + [Column("EVENT_CATEGORY")] - public Boolean Resolvable + public Int32 EventCategory { get { - return _resolvable; + return _eventcategory; } set { - if (_resolvable != value) + if (_eventcategory != value) { - _resolvable = value; + _eventcategory = value; - OnResolvableChanged(value); + OnEventCategoryChanged(value); } } } - protected EventTypesGroup _eventtypesgroup; + protected Int32 _eventgroup; /// - /// Gets or sets the eventtypebase event types groups. + /// 0 = Dispensers + /// 1 = Dryer + /// 2 = Dyeing Head + /// 3 = Electrical Cabinet + /// 4 = General Hardware + /// 5 = Ink Delivery System + /// 6 = Ink Filling System + /// 7 = Mixer + /// 8 = Thread Feeding System + /// 9 = Waste Handling System + /// 10 = Application + /// 11 = Transport + /// + /// /// - [XmlIgnore] - [JsonIgnore] - public virtual EventTypesGroup EventTypesGroup + [Column("EVENT_GROUP")] + + public Int32 EventGroup { get { - return _eventtypesgroup; + return _eventgroup; } set { - if (_eventtypesgroup != value) + if (_eventgroup != value) { - _eventtypesgroup = value; + _eventgroup = value; - OnEventTypesGroupChanged(value); + OnEventGroupChanged(value); } } } - protected EventTypesCategory _eventtypescategory; + protected Int32 _eventnotificationtime; /// - /// Gets or sets the eventtypebase event types categories. + /// 0 = None + /// 1 = Immidiate + /// 2 = Post Job /// - [XmlIgnore] - [JsonIgnore] - public virtual EventTypesCategory EventTypesCategory + [Column("EVENT_NOTIFICATION_TIME")] + + public Int32 EventNotificationTime { get { - return _eventtypescategory; + return _eventnotificationtime; } set { - if (_eventtypescategory != value) + if (_eventnotificationtime != value) { - _eventtypescategory = value; + _eventnotificationtime = value; - OnEventTypesCategoryChanged(value); + OnEventNotificationTimeChanged(value); } } } - protected HtmlPage _htmlpage; + protected String _eventactions; /// - /// Gets or sets the eventtypebase html pages. + /// 0 = Prevent Job + /// 1 = Stop Job /// - [XmlIgnore] - [JsonIgnore] - public virtual HtmlPage HtmlPage + [Column("EVENT_ACTIONS")] + + public String EventActions { get { - return _htmlpage; + return _eventactions; } set { - if (_htmlpage != value) + if (_eventactions != value) { - _htmlpage = value; + _eventactions = value; - OnHtmlPageChanged(value); + OnEventActionsChanged(value); } } } - protected SynchronizedObservableCollection _eventtypesactions; + protected Boolean _requiresuserintervention; /// - /// Gets or sets the eventtypebase event types actions. + /// Gets or sets the eventtypebase requires user intervention. /// - public virtual SynchronizedObservableCollection EventTypesActions + [Column("REQUIRES_USER_INTERVENTION")] + + public Boolean RequiresUserIntervention { get { - return _eventtypesactions; + return _requiresuserintervention; } set { - if (_eventtypesactions != value) + if (_requiresuserintervention != value) { - _eventtypesactions = value; + _requiresuserintervention = value; - OnEventTypesActionsChanged(value); + OnRequiresUserInterventionChanged(value); } } @@ -404,6 +414,15 @@ namespace Tango.BL.Entities RaisePropertyChanged(nameof(Name)); } + /// + /// Called when the Title has changed. + /// + protected virtual void OnTitleChanged(String title) + { + TitleChanged?.Invoke(this, title); + RaisePropertyChanged(nameof(Title)); + } + /// /// Called when the Description has changed. /// @@ -414,57 +433,66 @@ namespace Tango.BL.Entities } /// - /// Called when the RequiresUserIntervention has changed. + /// Called when the TechnicalDescription has changed. /// - protected virtual void OnRequiresUserInterventionChanged(Boolean requiresuserintervention) + protected virtual void OnTechnicalDescriptionChanged(String technicaldescription) { - RequiresUserInterventionChanged?.Invoke(this, requiresuserintervention); - RaisePropertyChanged(nameof(RequiresUserIntervention)); + TechnicalDescriptionChanged?.Invoke(this, technicaldescription); + RaisePropertyChanged(nameof(TechnicalDescription)); } /// - /// Called when the Resolvable has changed. + /// Called when the ComponentIndex has changed. /// - protected virtual void OnResolvableChanged(Boolean resolvable) + protected virtual void OnComponentIndexChanged(Int32 componentindex) { - ResolvableChanged?.Invoke(this, resolvable); - RaisePropertyChanged(nameof(Resolvable)); + ComponentIndexChanged?.Invoke(this, componentindex); + RaisePropertyChanged(nameof(ComponentIndex)); } /// - /// Called when the EventTypesGroup has changed. + /// Called when the EventCategory has changed. /// - protected virtual void OnEventTypesGroupChanged(EventTypesGroup eventtypesgroup) + protected virtual void OnEventCategoryChanged(Int32 eventcategory) { - EventTypesGroupChanged?.Invoke(this, eventtypesgroup); - RaisePropertyChanged(nameof(EventTypesGroup)); + EventCategoryChanged?.Invoke(this, eventcategory); + RaisePropertyChanged(nameof(EventCategory)); } /// - /// Called when the EventTypesCategory has changed. + /// Called when the EventGroup has changed. /// - protected virtual void OnEventTypesCategoryChanged(EventTypesCategory eventtypescategory) + protected virtual void OnEventGroupChanged(Int32 eventgroup) { - EventTypesCategoryChanged?.Invoke(this, eventtypescategory); - RaisePropertyChanged(nameof(EventTypesCategory)); + EventGroupChanged?.Invoke(this, eventgroup); + RaisePropertyChanged(nameof(EventGroup)); } /// - /// Called when the HtmlPage has changed. + /// Called when the EventNotificationTime has changed. /// - protected virtual void OnHtmlPageChanged(HtmlPage htmlpage) + protected virtual void OnEventNotificationTimeChanged(Int32 eventnotificationtime) { - HtmlPageChanged?.Invoke(this, htmlpage); - RaisePropertyChanged(nameof(HtmlPage)); + EventNotificationTimeChanged?.Invoke(this, eventnotificationtime); + RaisePropertyChanged(nameof(EventNotificationTime)); } /// - /// Called when the EventTypesActions has changed. + /// Called when the EventActions has changed. /// - protected virtual void OnEventTypesActionsChanged(SynchronizedObservableCollection eventtypesactions) + protected virtual void OnEventActionsChanged(String eventactions) { - EventTypesActionsChanged?.Invoke(this, eventtypesactions); - RaisePropertyChanged(nameof(EventTypesActions)); + EventActionsChanged?.Invoke(this, eventactions); + RaisePropertyChanged(nameof(EventActions)); + } + + /// + /// Called when the RequiresUserIntervention has changed. + /// + protected virtual void OnRequiresUserInterventionChanged(Boolean requiresuserintervention) + { + RequiresUserInterventionChanged?.Invoke(this, requiresuserintervention); + RaisePropertyChanged(nameof(RequiresUserIntervention)); } /// @@ -482,8 +510,6 @@ namespace Tango.BL.Entities public EventTypeBase() : base() { - EventTypesActions = new SynchronizedObservableCollection(); - MachinesEvents = new SynchronizedObservableCollection(); } diff --git a/Software/Visual_Studio/Tango.BL/Entities/EventTypesAction.cs b/Software/Visual_Studio/Tango.BL/Entities/EventTypesAction.cs deleted file mode 100644 index 4b2bed316..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/EventTypesAction.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.Entities -{ - public partial class EventTypesAction : EventTypesActionBase - { - /// - /// Initializes a new instance of the class. - /// - public EventTypesAction() : base() - { - - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/EventTypesActionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/EventTypesActionBase.cs deleted file mode 100644 index 64b3f8101..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/EventTypesActionBase.cs +++ /dev/null @@ -1,161 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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! -// -//------------------------------------------------------------------------------ - -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; - -namespace Tango.BL.Entities -{ - [Table("EVENT_TYPES_ACTIONS")] - public abstract class EventTypesActionBase : ObservableEntity - { - - public event EventHandler ActionTypeChanged; - - public event EventHandler EventTypeChanged; - - protected String _eventtypeguid; - - /// - /// Gets or sets the eventtypesactionbase event type guid. - /// - - [Column("EVENT_TYPE_GUID")] - [ForeignKey("EventType")] - - public String EventTypeGuid - { - get - { - return _eventtypeguid; - } - - set - { - if (_eventtypeguid != value) - { - _eventtypeguid = value; - } - } - } - - protected String _actiontypeguid; - - /// - /// Gets or sets the eventtypesactionbase action type guid. - /// - - [Column("ACTION_TYPE_GUID")] - [ForeignKey("ActionType")] - - public String ActionTypeGuid - { - get - { - return _actiontypeguid; - } - - set - { - if (_actiontypeguid != value) - { - _actiontypeguid = value; - } - } - } - - protected ActionType _actiontype; - - /// - /// Gets or sets the eventtypesactionbase action types. - /// - - [XmlIgnore] - [JsonIgnore] - public virtual ActionType ActionType - { - get - { - return _actiontype; - } - - set - { - if (_actiontype != value) - { - _actiontype = value; - - OnActionTypeChanged(value); - - } - } - } - - protected EventType _eventtype; - - /// - /// Gets or sets the eventtypesactionbase event types. - /// - - [XmlIgnore] - [JsonIgnore] - public virtual EventType EventType - { - get - { - return _eventtype; - } - - set - { - if (_eventtype != value) - { - _eventtype = value; - - OnEventTypeChanged(value); - - } - } - } - - /// - /// Called when the ActionType has changed. - /// - protected virtual void OnActionTypeChanged(ActionType actiontype) - { - ActionTypeChanged?.Invoke(this, actiontype); - RaisePropertyChanged(nameof(ActionType)); - } - - /// - /// Called when the EventType has changed. - /// - protected virtual void OnEventTypeChanged(EventType eventtype) - { - EventTypeChanged?.Invoke(this, eventtype); - RaisePropertyChanged(nameof(EventType)); - } - - /// - /// Initializes a new instance of the class. - /// - public EventTypesActionBase() : base() - { - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/EventTypesCategory.cs b/Software/Visual_Studio/Tango.BL/Entities/EventTypesCategory.cs deleted file mode 100644 index 742147a5d..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/EventTypesCategory.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.Entities -{ - public partial class EventTypesCategory : EventTypesCategoryBase - { - /// - /// Initializes a new instance of the class. - /// - public EventTypesCategory() : base() - { - - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/EventTypesCategoryBase.cs b/Software/Visual_Studio/Tango.BL/Entities/EventTypesCategoryBase.cs deleted file mode 100644 index 6faed476f..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/EventTypesCategoryBase.cs +++ /dev/null @@ -1,188 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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! -// -//------------------------------------------------------------------------------ - -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; - -namespace Tango.BL.Entities -{ - [Table("EVENT_TYPES_CATEGORIES")] - public abstract class EventTypesCategoryBase : ObservableEntity - { - - public event EventHandler CodeChanged; - - public event EventHandler NameChanged; - - public event EventHandler DescriptionChanged; - - public event EventHandler> EventTypesChanged; - - protected Int32 _code; - - /// - /// Gets or sets the eventtypescategorybase code. - /// - - [Column("CODE")] - - public Int32 Code - { - get - { - return _code; - } - - set - { - if (_code != value) - { - _code = value; - - OnCodeChanged(value); - - } - } - } - - protected String _name; - - /// - /// Gets or sets the eventtypescategorybase name. - /// - - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - if (_name != value) - { - _name = value; - - OnNameChanged(value); - - } - } - } - - protected String _description; - - /// - /// Gets or sets the eventtypescategorybase description. - /// - - [Column("DESCRIPTION")] - - public String Description - { - get - { - return _description; - } - - set - { - if (_description != value) - { - _description = value; - - OnDescriptionChanged(value); - - } - } - } - - protected SynchronizedObservableCollection _eventtypes; - - /// - /// Gets or sets the eventtypescategorybase event types. - /// - - public virtual SynchronizedObservableCollection EventTypes - { - get - { - return _eventtypes; - } - - set - { - if (_eventtypes != value) - { - _eventtypes = value; - - OnEventTypesChanged(value); - - } - } - } - - /// - /// Called when the Code has changed. - /// - protected virtual void OnCodeChanged(Int32 code) - { - CodeChanged?.Invoke(this, code); - RaisePropertyChanged(nameof(Code)); - } - - /// - /// Called when the Name has changed. - /// - protected virtual void OnNameChanged(String name) - { - NameChanged?.Invoke(this, name); - RaisePropertyChanged(nameof(Name)); - } - - /// - /// Called when the Description has changed. - /// - protected virtual void OnDescriptionChanged(String description) - { - DescriptionChanged?.Invoke(this, description); - RaisePropertyChanged(nameof(Description)); - } - - /// - /// Called when the EventTypes has changed. - /// - protected virtual void OnEventTypesChanged(SynchronizedObservableCollection eventtypes) - { - EventTypesChanged?.Invoke(this, eventtypes); - RaisePropertyChanged(nameof(EventTypes)); - } - - /// - /// Initializes a new instance of the class. - /// - public EventTypesCategoryBase() : base() - { - - EventTypes = new SynchronizedObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/EventTypesGroup.cs b/Software/Visual_Studio/Tango.BL/Entities/EventTypesGroup.cs deleted file mode 100644 index 3e7a737d0..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/EventTypesGroup.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.Entities -{ - public partial class EventTypesGroup : EventTypesGroupBase - { - /// - /// Initializes a new instance of the class. - /// - public EventTypesGroup() : base() - { - - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/EventTypesGroupBase.cs b/Software/Visual_Studio/Tango.BL/Entities/EventTypesGroupBase.cs deleted file mode 100644 index f234d0d89..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/EventTypesGroupBase.cs +++ /dev/null @@ -1,188 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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! -// -//------------------------------------------------------------------------------ - -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; - -namespace Tango.BL.Entities -{ - [Table("EVENT_TYPES_GROUPS")] - public abstract class EventTypesGroupBase : ObservableEntity - { - - public event EventHandler CodeChanged; - - public event EventHandler NameChanged; - - public event EventHandler DescriptionChanged; - - public event EventHandler> EventTypesChanged; - - protected Int32 _code; - - /// - /// Gets or sets the eventtypesgroupbase code. - /// - - [Column("CODE")] - - public Int32 Code - { - get - { - return _code; - } - - set - { - if (_code != value) - { - _code = value; - - OnCodeChanged(value); - - } - } - } - - protected String _name; - - /// - /// Gets or sets the eventtypesgroupbase name. - /// - - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - if (_name != value) - { - _name = value; - - OnNameChanged(value); - - } - } - } - - protected String _description; - - /// - /// Gets or sets the eventtypesgroupbase description. - /// - - [Column("DESCRIPTION")] - - public String Description - { - get - { - return _description; - } - - set - { - if (_description != value) - { - _description = value; - - OnDescriptionChanged(value); - - } - } - } - - protected SynchronizedObservableCollection _eventtypes; - - /// - /// Gets or sets the eventtypesgroupbase event types. - /// - - public virtual SynchronizedObservableCollection EventTypes - { - get - { - return _eventtypes; - } - - set - { - if (_eventtypes != value) - { - _eventtypes = value; - - OnEventTypesChanged(value); - - } - } - } - - /// - /// Called when the Code has changed. - /// - protected virtual void OnCodeChanged(Int32 code) - { - CodeChanged?.Invoke(this, code); - RaisePropertyChanged(nameof(Code)); - } - - /// - /// Called when the Name has changed. - /// - protected virtual void OnNameChanged(String name) - { - NameChanged?.Invoke(this, name); - RaisePropertyChanged(nameof(Name)); - } - - /// - /// Called when the Description has changed. - /// - protected virtual void OnDescriptionChanged(String description) - { - DescriptionChanged?.Invoke(this, description); - RaisePropertyChanged(nameof(Description)); - } - - /// - /// Called when the EventTypes has changed. - /// - protected virtual void OnEventTypesChanged(SynchronizedObservableCollection eventtypes) - { - EventTypesChanged?.Invoke(this, eventtypes); - RaisePropertyChanged(nameof(EventTypes)); - } - - /// - /// Initializes a new instance of the class. - /// - public EventTypesGroupBase() : base() - { - - EventTypes = new SynchronizedObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/HtmlPage.cs b/Software/Visual_Studio/Tango.BL/Entities/HtmlPage.cs deleted file mode 100644 index ea57d5cf7..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/HtmlPage.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.Entities -{ - public partial class HtmlPage : HtmlPageBase - { - /// - /// Initializes a new instance of the class. - /// - public HtmlPage() : base() - { - - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/HtmlPageBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HtmlPageBase.cs deleted file mode 100644 index c955f8d0a..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/HtmlPageBase.cs +++ /dev/null @@ -1,226 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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! -// -//------------------------------------------------------------------------------ - -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; - -namespace Tango.BL.Entities -{ - [Table("HTML_PAGES")] - public abstract class HtmlPageBase : ObservableEntity - { - - public event EventHandler CodeChanged; - - public event EventHandler NameChanged; - - public event EventHandler DescriptionChanged; - - public event EventHandler HtmlChanged; - - public event EventHandler> EventTypesChanged; - - protected Int32 _code; - - /// - /// Gets or sets the htmlpagebase code. - /// - - [Column("CODE")] - - public Int32 Code - { - get - { - return _code; - } - - set - { - if (_code != value) - { - _code = value; - - OnCodeChanged(value); - - } - } - } - - protected String _name; - - /// - /// Gets or sets the htmlpagebase name. - /// - - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - if (_name != value) - { - _name = value; - - OnNameChanged(value); - - } - } - } - - protected String _description; - - /// - /// Gets or sets the htmlpagebase description. - /// - - [Column("DESCRIPTION")] - - public String Description - { - get - { - return _description; - } - - set - { - if (_description != value) - { - _description = value; - - OnDescriptionChanged(value); - - } - } - } - - protected String _html; - - /// - /// Gets or sets the htmlpagebase html. - /// - - [Column("HTML")] - - public String Html - { - get - { - return _html; - } - - set - { - if (_html != value) - { - _html = value; - - OnHtmlChanged(value); - - } - } - } - - protected SynchronizedObservableCollection _eventtypes; - - /// - /// Gets or sets the htmlpagebase event types. - /// - - public virtual SynchronizedObservableCollection EventTypes - { - get - { - return _eventtypes; - } - - set - { - if (_eventtypes != value) - { - _eventtypes = value; - - OnEventTypesChanged(value); - - } - } - } - - /// - /// Called when the Code has changed. - /// - protected virtual void OnCodeChanged(Int32 code) - { - CodeChanged?.Invoke(this, code); - RaisePropertyChanged(nameof(Code)); - } - - /// - /// Called when the Name has changed. - /// - protected virtual void OnNameChanged(String name) - { - NameChanged?.Invoke(this, name); - RaisePropertyChanged(nameof(Name)); - } - - /// - /// Called when the Description has changed. - /// - protected virtual void OnDescriptionChanged(String description) - { - DescriptionChanged?.Invoke(this, description); - RaisePropertyChanged(nameof(Description)); - } - - /// - /// Called when the Html has changed. - /// - protected virtual void OnHtmlChanged(String html) - { - HtmlChanged?.Invoke(this, html); - RaisePropertyChanged(nameof(Html)); - } - - /// - /// Called when the EventTypes has changed. - /// - protected virtual void OnEventTypesChanged(SynchronizedObservableCollection eventtypes) - { - EventTypesChanged?.Invoke(this, eventtypes); - RaisePropertyChanged(nameof(EventTypes)); - } - - /// - /// Initializes a new instance of the class. - /// - public HtmlPageBase() : base() - { - - EventTypes = new SynchronizedObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/Machine.cs b/Software/Visual_Studio/Tango.BL/Entities/Machine.cs index cee3448cb..a7ba29c2a 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/Machine.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/Machine.cs @@ -27,14 +27,7 @@ namespace Tango.BL.Entities { try { - if (!String.IsNullOrWhiteSpace(TargetJobTypes)) - { - return TargetJobTypes.Split(',').Select(x => (JobTypes)int.Parse(x)).ToList(); - } - else - { - return new List(); - } + return TargetJobTypes.ToEnumValues(','); } catch (Exception ex) { diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachinesEvent.cs b/Software/Visual_Studio/Tango.BL/Entities/MachinesEvent.cs index a81de795e..f3eb2680c 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MachinesEvent.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MachinesEvent.cs @@ -52,27 +52,33 @@ namespace Tango.BL.Entities } [NotMapped] - public EventTypesCategories Category + public EventTypes Type { - get { return (EventTypesCategories)EventType.EventTypesCategory.Code; } + get { return EventType.Type; } } [NotMapped] - public EventTypesGroups Group + public EventTypeCategories Category { - get { return (EventTypesGroups)EventType.EventTypesGroup.Code; } + get { return (EventTypeCategories)EventType.EventCategory; } } [NotMapped] - public EventTypes Type + public EventTypeGroups Group + { + get { return (EventTypeGroups)EventType.EventGroup; } + } + + [NotMapped] + public EventTypeNotificationTimes NotificationTime { - get { return (EventTypes)EventType.Code; } + get { return EventType.NotificationTime; } } [NotMapped] - public List ActionTypes + public List Actions { - get { return EventType.EventTypesActions.Select(x => (ActionTypes)x.ActionType.Code).Distinct().ToList(); } + get { return EventType.Actions; } } /// diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/ActionTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/ActionTypes.cs deleted file mode 100644 index 4742e5d99..000000000 --- a/Software/Visual_Studio/Tango.BL/Enumerations/ActionTypes.cs +++ /dev/null @@ -1,53 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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! -// -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.ComponentModel; - -namespace Tango.BL.Enumerations -{ - public enum ActionTypes - { - - /// - /// (Stops the heaters funcionality) - /// - [Description("Stops the heaters funcionality")] - StopHeaters = 2, - - /// - /// (Prevents the user from executing jobs) - /// - [Description("Prevents the user from executing jobs")] - PreventJobExecution = 0, - - /// - /// (Displays a graceful notification to the user) - /// - [Description("Displays a graceful notification to the user")] - SoftVisualNotification = 4, - - /// - /// (System Shutdown) - /// - [Description("System Shutdown")] - OverallPowerDown = 3, - - /// - /// (Abort a running job if is in progress) - /// - [Description("Abort a running job if is in progress")] - AbortRunningJob = 1, - - } -} diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/Actions.cs b/Software/Visual_Studio/Tango.BL/Enumerations/Actions.cs deleted file mode 100644 index f6a5d3997..000000000 --- a/Software/Visual_Studio/Tango.BL/Enumerations/Actions.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.ComponentModel; - -namespace Tango.BL.Entities -{ - public enum Actions - { - } -} diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/EventTypeActions.cs b/Software/Visual_Studio/Tango.BL/Enumerations/EventTypeActions.cs new file mode 100644 index 000000000..a7efc7cd5 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Enumerations/EventTypeActions.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.BL.Enumerations +{ + public enum EventTypeActions + { + PreventJob = 0, + StopJob = 1, + } +} diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/EventTypeCategories.cs b/Software/Visual_Studio/Tango.BL/Enumerations/EventTypeCategories.cs new file mode 100644 index 000000000..48301ece0 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Enumerations/EventTypeCategories.cs @@ -0,0 +1,36 @@ +//------------------------------------------------------------------------------ +// +// 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! +// +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.ComponentModel; + +namespace Tango.BL.Enumerations +{ + public enum EventTypeCategories + { + [Description("Information")] + Info = 0, + + [Description("Warning")] + Warning = 1, + + [Description("Error")] + Error = 2, + + [Description("Critical")] + Critical = 3, + + [Description("Safety")] + Safety = 4, + } +} diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/EventTypeGroups.cs b/Software/Visual_Studio/Tango.BL/Enumerations/EventTypeGroups.cs new file mode 100644 index 000000000..e6fc435d1 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Enumerations/EventTypeGroups.cs @@ -0,0 +1,46 @@ +//------------------------------------------------------------------------------ +// +// 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! +// +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.ComponentModel; + +namespace Tango.BL.Enumerations +{ + public enum EventTypeGroups + { + [Description("Dispensers")] + Dispensers = 0, + [Description("Dryer")] + Dryer = 1, + [Description("Dyeing Head")] + DyeingHead = 2, + [Description("Electrical Cabinet")] + ElectricalCabinet = 3, + [Description("General Hardware")] + GeneralHardware = 4, + [Description("Ink Delivery System")] + InkDeliverySystem = 5, + [Description("Ink Filling System")] + InkFillingSystem = 6, + [Description("Mixer")] + Mixer = 7, + [Description("Thread Feeding System")] + ThreadFeedingSystem = 8, + [Description("Waste Handling System")] + WasteHandlingSystem = 9, + [Description("Application")] + Application = 10, + [Description("Transport")] + Transport = 11 + } +} diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/EventTypeNotificationTimes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/EventTypeNotificationTimes.cs new file mode 100644 index 000000000..312c1f3f1 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Enumerations/EventTypeNotificationTimes.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.BL.Enumerations +{ + public enum EventTypeNotificationTimes + { + None = 0, + Immediate = 1, + PostJob = 2 + } +} diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/EventTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/EventTypes.cs index b4fc2b82a..50ccd20c2 100644 --- a/Software/Visual_Studio/Tango.BL/Enumerations/EventTypes.cs +++ b/Software/Visual_Studio/Tango.BL/Enumerations/EventTypes.cs @@ -20,958 +20,1300 @@ namespace Tango.BL.Enumerations { /// - /// (None) + /// (Could not complete power-up BIT. ) /// - [Description("None")] - None = 0, + [Description("Could not complete power-up BIT. ")] + POWER_UP_BIT_FAILURE = 1, /// - /// ( Thread Break) + /// (Emergency button pressed) /// - [Description(" Thread Break")] - ThreadBreak = 1, + [Description("Emergency button pressed")] + EMERGENCY_PUSH_BUTTON_PRESSED = 2, /// - /// ( Thread Tension Control Failure) + /// (Front cover 1 open ) /// - [Description(" Thread Tension Control Failure")] - ThreadTensionControlFailure = 2, + [Description("Front cover 1 open ")] + FRONT_COVER_1_OPEN = 3, /// - /// ( Feeder Cone Insufficiant) + /// (Front cover 2 open ) /// - [Description(" Feeder Cone Insufficiant")] - FeederConeInsufficiant = 3, + [Description("Front cover 2 open ")] + FRONT_COVER_2_OPEN = 4, /// - /// ( Winder General Error) + /// (Front cover 3 open ) /// - [Description(" Winder General Error")] - WinderGeneralError = 4, + [Description("Front cover 3 open ")] + FRONT_COVER_3_OPEN = 5, /// - /// ( Winder Cone Not Exists) + /// (Front cover 4 open ) /// - [Description(" Winder Cone Not Exists")] - WinderConeNotExists = 5, + [Description("Front cover 4 open ")] + FRONT_COVER_4_OPEN = 6, /// - /// ( Thread Feeding General Error) + /// (Cartridges cover open ) /// - [Description(" Thread Feeding General Error")] - ThreadFeedingGeneralError = 6, + [Description("Cartridges cover open ")] + CARTRIDGES_COVER_OPEN = 7, /// - /// ( Dyeing Head 1 Over Temperature) + /// (Rear cover open ) /// - [Description(" Dyeing Head 1 Over Temperature")] - DyeingHead1OverTemperature = 7, + [Description("Rear cover open ")] + REAR_COVER_OPEN = 8, /// - /// ( Dyeing Head 2 Over Temperature) + /// (Overtemperature in machine intern) /// - [Description(" Dyeing Head 2 Over Temperature")] - DyeingHead2OverTemperature = 8, + [Description("Overtemperature in machine intern")] + MACHINE_INTERNAL_OVERTEMPERATURE = 9, /// - /// ( Dyeing Head 3 Over Temperature) + /// (Internal fans RPM too low) /// - [Description(" Dyeing Head 3 Over Temperature")] - DyeingHead3OverTemperature = 9, + [Description("Internal fans RPM too low")] + MACHINE_FANS_RPM_TOO_LOW = 10, /// - /// ( Dyeing Head 4 Over Temperature) + /// (Internal fans stopped) /// - [Description(" Dyeing Head 4 Over Temperature")] - DyeingHead4OverTemperature = 10, + [Description("Internal fans stopped")] + MACHINE_FANS_STOPPED = 11, /// - /// ( Dyeing Head 5 Over Temperature) + /// (Thread break) /// - [Description(" Dyeing Head 5 Over Temperature")] - DyeingHead5OverTemperature = 11, + [Description("Thread break")] + THREAD_BREAK = 12, /// - /// ( Dyeing Head 6 Over Temperature) + /// (Thread tension control faiure) /// - [Description(" Dyeing Head 6 Over Temperature")] - DyeingHead6OverTemperature = 12, + [Description("Thread tension control faiure")] + THREAD_TENSION_CONTROL_FAILURE = 13, /// - /// ( Dyeing Head Thermal Cutoff) + /// (No cone in winder) /// - [Description(" Dyeing Head Thermal Cutoff")] - DyeingHeadThermalCutoff = 13, + [Description("No cone in winder")] + WINDER_CONE_DOES_NOT_EXIST = 14, /// - /// ( Dryer Over Temperature) + /// (Overcurrent in feeder motor) /// - [Description(" Dryer Over Temperature")] - DryerOverTemperature = 14, + [Description("Overcurrent in feeder motor")] + FEEDER_MOTOR_OVERCURRENT = 15, /// - /// ( Dryer Thermal Cutoff) + /// (Overcurrent in right loader motor) /// - [Description(" Dryer Thermal Cutoff")] - DryerThermalCutoff = 15, + [Description("Overcurrent in right loader motor")] + RIGHT_LOADER_MOTOR_OVERCURRENT = 16, /// - /// ( Dyeing Head Heaters Current Out Of Range) + /// (Overcurrent in puller motor) /// - [Description(" Dyeing Head Heaters Current Out Of Range")] - DyeingHeadHeatersCurrentOutOfRange = 16, + [Description("Overcurrent in puller motor")] + PULLER_MOTOR_OVERCURRENT = 17, /// - /// ( Dryer Heaters Current Out Of Range) + /// (Overcurrent in left loader motor) /// - [Description(" Dryer Heaters Current Out Of Range")] - DryerHeatersCurrentOutOfRange = 17, + [Description("Overcurrent in left loader motor")] + LEFT_LOADER_MOTOR_OVERCURRENT = 18, /// - /// ( Dryer Dying Head Cover Open) + /// (Overcurrent in winder motor) /// - [Description(" Dryer Dying Head Cover Open")] - DryerDHeadCoverOpen = 18, + [Description("Overcurrent in winder motor")] + WINDER_MOTOR_OVERCURRENT = 19, /// - /// ( Air Filter Clogged) + /// (Overcurrent in screw motor) /// - [Description(" Air Filter Clogged")] - AirFilterClogged = 19, + [Description("Overcurrent in screw motor")] + SCREW_MOTOR_OVERCURRENT = 20, /// - /// ( Air Filter Not Installed) + /// (Overcurrent in loading arm motor) /// - [Description(" Air Filter Not Installed")] - AirFilterNotInstalled = 20, + [Description("Overcurrent in loading arm motor")] + LOADING_ARM_MOTOR_OVERCURRENT = 21, /// - /// ( WHS Failure) + /// (Overtemperature in feeder motor) /// - [Description(" WHS Failure")] - WHSFailure = 21, + [Description("Overtemperature in feeder motor")] + FEEDER_MOTOR_OVERTEMPERATURE = 22, /// - /// ( Waste Container Is Almost Full) + /// (Overtemperature in right loader motor) /// - [Description(" Waste Container Is Almost Full")] - WasteContainerIsAlmostFull = 22, + [Description("Overtemperature in right loader motor")] + RIGHT_LOADER_MOTOR_OVERTEMPERATURE = 23, /// - /// ( Waste Container Is Full) + /// (Overtemperature in puller motor) /// - [Description(" Waste Container Is Full")] - WasteContainerIsFull = 23, + [Description("Overtemperature in puller motor")] + PULLER_MOTOR_OVERTEMPERATURE = 24, /// - /// ( Dispenser 1 Empty) + /// (Overtemperature in left loader motor) /// - [Description(" Dispenser 1 Empty")] - Dispenser1Empty = 24, + [Description("Overtemperature in left loader motor")] + LEFT_LOADER_MOTOR_OVERTEMPERATURE = 25, /// - /// ( Dispenser 2 Empty) + /// (Overtemperature in winder motor) /// - [Description(" Dispenser 2 Empty")] - Dispenser2Empty = 25, + [Description("Overtemperature in winder motor")] + WINDER_MOTOR_OVERTEMPERATURE = 26, /// - /// ( Dispenser 3 Empty) + /// (Overtemperature in screw motor) /// - [Description(" Dispenser 3 Empty")] - Dispenser3Empty = 26, + [Description("Overtemperature in screw motor")] + SCREW_MOTOR_OVERTEMPERATURE = 27, /// - /// ( Dispenser 4 Empty) + /// (Overtemperature in loading arm motor) /// - [Description(" Dispenser 4 Empty")] - Dispenser4Empty = 27, + [Description("Overtemperature in loading arm motor")] + LOADING_ARM_MOTOR_OVERTEMPERATURE = 28, /// - /// ( Dispenser 5 Empty) + /// (Feeder motor stalled) /// - [Description(" Dispenser 5 Empty")] - Dispenser5Empty = 28, + [Description("Feeder motor stalled")] + FEEDER_MOTOR_STALL = 29, /// - /// ( Dispenser 6 Empty) + /// (Right loader motor stalled) /// - [Description(" Dispenser 6 Empty")] - Dispenser6Empty = 29, + [Description("Right loader motor stalled")] + RIGHT_LOADER_MOTOR_STALL = 30, /// - /// ( Dispenser 7 Empty) + /// (Puller motor stalled) /// - [Description(" Dispenser 7 Empty")] - Dispenser7Empty = 30, + [Description("Puller motor stalled")] + PULLER_MOTOR_STALL = 31, /// - /// ( Dispenser 8 Empty) + /// (Left loader motor stalled) /// - [Description(" Dispenser 8 Empty")] - Dispenser8Empty = 31, + [Description("Left loader motor stalled")] + LEFT_LOADER_MOTOR_STALL = 32, /// - /// ( Dispenser 1 Low Level) + /// (Winder motor stalled) /// - [Description(" Dispenser 1 Low Level")] - Dispenser1LowLevel = 32, + [Description("Winder motor stalled")] + WINDER_MOTOR_STALL = 33, /// - /// ( Dispenser 2 Low Level) + /// (Screw motor stalled) /// - [Description(" Dispenser 2 Low Level")] - Dispenser2LowLevel = 33, + [Description("Screw motor stalled")] + SCREW_MOTOR_STALL = 34, /// - /// ( Dispenser 3 Low Level) + /// (Loading arm motor stalled) /// - [Description(" Dispenser 3 Low Level")] - Dispenser3LowLevel = 34, + [Description("Loading arm motor stalled")] + LOADING_ARM_MOTOR_STALL = 35, /// - /// ( Dispenser 4 Low Level) + /// (Undervoltage in feeder motor) /// - [Description(" Dispenser 4 Low Level")] - Dispenser4LowLevel = 35, + [Description("Undervoltage in feeder motor")] + FEEDER_MOTOR_UNDERVOLTAGE = 36, /// - /// ( Dispenser 5 Low Level) + /// (Undervoltage in right loader motor) /// - [Description(" Dispenser 5 Low Level")] - Dispenser5LowLevel = 36, + [Description("Undervoltage in right loader motor")] + RIGHT_LOADER_MOTOR_UNDERVOLTAGE = 37, /// - /// ( Dispenser 6 Low Level) + /// (Undervoltage in puller motor) /// - [Description(" Dispenser 6 Low Level")] - Dispenser6LowLevel = 37, + [Description("Undervoltage in puller motor")] + PULLER_MOTOR_UNDERVOLTAGE = 38, /// - /// ( Dispenser 7 Low Level) + /// (Undervoltage in left loader motor) /// - [Description(" Dispenser 7 Low Level")] - Dispenser7LowLevel = 38, + [Description("Undervoltage in left loader motor")] + LEFT_LOADER_MOTOR_UNDERVOLTAGE = 39, /// - /// ( Dispenser 8 Low Level) + /// (Undervoltage in winder motor) /// - [Description(" Dispenser 8 Low Level")] - Dispenser8LowLevel = 39, + [Description("Undervoltage in winder motor")] + WINDER_MOTOR_UNDERVOLTAGE = 40, /// - /// ( Dispenser 1 Refill Failure) + /// (Undervoltage in screw motor) /// - [Description(" Dispenser 1 Refill Failure")] - Dispenser1RefillFailure = 40, + [Description("Undervoltage in screw motor")] + SCREW_MOTOR_UNDERVOLTAGE = 41, /// - /// ( Dispenser 2 Refill Failure) + /// (Undervoltage in loading arm motor) /// - [Description(" Dispenser 2 Refill Failure")] - Dispenser2RefillFailure = 41, + [Description("Undervoltage in loading arm motor")] + LOADING_ARM_MOTOR_UNDERVOLTAGE = 42, /// - /// ( Dispenser 3 Refill Failure) + /// (LTFU up failure) /// - [Description(" Dispenser 3 Refill Failure")] - Dispenser3RefillFailure = 42, + [Description("LTFU up failure")] + LTFU_UP_TIMEOUT = 43, /// - /// ( Dispenser 4 Refill Failure) + /// (LTFU down failure) /// - [Description(" Dispenser 4 Refill Failure")] - Dispenser4RefillFailure = 43, + [Description("LTFU down failure")] + LTFU_DOWN_TIMEOUT = 44, /// - /// ( Dispenser 5 Refill Failure) + /// (RTFU up failure) /// - [Description(" Dispenser 5 Refill Failure")] - Dispenser5RefillFailure = 44, + [Description("RTFU up failure")] + RTFU_UP_TIMEOUT = 45, /// - /// ( Dispenser 6 Refill Failure) + /// (RTFU down failure) /// - [Description(" Dispenser 6 Refill Failure")] - Dispenser6RefillFailure = 45, + [Description("RTFU down failure")] + RTFU_DOWN_TIMEOUT = 46, /// - /// ( Dispenser 7 Refill Failure) + /// (Screw travel failure) /// - [Description(" Dispenser 7 Refill Failure")] - Dispenser7RefillFailure = 46, + [Description("Screw travel failure")] + SCREW_MOTOR_LIMIT_TIMEOUT = 47, /// - /// ( Dispenser 8 Refill Failure) + /// (Overcurrent in dryer motor) /// - [Description(" Dispenser 8 Refill Failure")] - Dispenser8RefillFailure = 47, + [Description("Overcurrent in dryer motor")] + DRYER_MOTOR_OVERCURRENT = 48, /// - /// ( Dispenser 1 Pressure) + /// (Overtemperature in dryer motor) /// - [Description(" Dispenser 1 Pressure")] - Dispenser1Pressure = 48, + [Description("Overtemperature in dryer motor")] + DRYER_MOTOR_OVERTEMPERATURE = 49, /// - /// ( Dispenser 2 Pressure) + /// (Dryer motor stalled) /// - [Description(" Dispenser 2 Pressure")] - Dispenser2Pressure = 49, + [Description("Dryer motor stalled")] + DRYER_MOTOR_STALL = 50, /// - /// ( Dispenser 3 Pressure) + /// (Undervoltage in dryer motor) /// - [Description(" Dispenser 3 Pressure")] - Dispenser3Pressure = 50, + [Description("Undervoltage in dryer motor")] + DRYER_MOTOR_UNDERVOLTAGE = 51, /// - /// ( Dispenser 4 Pressure) + /// (Dryer door open) /// - [Description(" Dispenser 4 Pressure")] - Dispenser4Pressure = 51, + [Description("Dryer door open")] + DRYER_DOOR_OPEN = 52, /// - /// ( Dispenser 5 Pressure) + /// (Overtemperature in dryer zone 1) /// - [Description(" Dispenser 5 Pressure")] - Dispenser5Pressure = 52, + [Description("Overtemperature in dryer zone 1")] + DRYER_ZONE_1_OVERTEMPERATURE = 53, /// - /// ( Dispenser 6 Pressure) + /// (Overtemperature in dryer zone 2) /// - [Description(" Dispenser 6 Pressure")] - Dispenser6Pressure = 53, + [Description("Overtemperature in dryer zone 2")] + DRYER_ZONE_2_OVERTEMPERATURE = 54, /// - /// ( Dispenser 7 Pressure) + /// (Undertemperature in dryer zone 1) /// - [Description(" Dispenser 7 Pressure")] - Dispenser7Pressure = 54, + [Description("Undertemperature in dryer zone 1")] + DRYER_ZONE_1_UNDERTEMPERATURE_A = 55, /// - /// ( Dispenser 8 Pressure) + /// (Undertemperature in dryer zone 2) /// - [Description(" Dispenser 8 Pressure")] - Dispenser8Pressure = 55, + [Description("Undertemperature in dryer zone 2")] + DRYER_ZONE_2_UNDERTEMPERATURE_A = 56, /// - /// ( Mid Tank 1 Empty) + /// (Undertemperature in dryer zone 1) /// - [Description(" Mid Tank 1 Empty")] - MidTank1Empty = 56, + [Description("Undertemperature in dryer zone 1")] + DRYER_ZONE_1_UNDERTEMPERATURE_B = 57, /// - /// ( Mid Tank 2 Empty) + /// (Undertemperature in dryer zone 2) /// - [Description(" Mid Tank 2 Empty")] - MidTank2Empty = 57, + [Description("Undertemperature in dryer zone 2")] + DRYER_ZONE_2_UNDERTEMPERATURE_B = 58, /// - /// ( Mid Tank 3 Empty) + /// (Overheating in dryer) /// - [Description(" Mid Tank 3 Empty")] - MidTank3Empty = 58, + [Description("Overheating in dryer")] + DRYER_THERMAL_CUTOFF = 59, /// - /// ( Mid Tank 4 Empty) + /// (Dryer zone 1 current out of range) /// - [Description(" Mid Tank 4 Empty")] - MidTank4Empty = 59, + [Description("Dryer zone 1 current out of range")] + DRYER_HEATERS_ZONE_1_CURRENT_OUT_OF_RANGE = 60, /// - /// ( Mid Tank 5 Empty) + /// (Dryer zone 2 current out of range) /// - [Description(" Mid Tank 5 Empty")] - MidTank5Empty = 60, + [Description("Dryer zone 2 current out of range")] + DRYER_HEATERS_ZONE_2_CURRENT_OUT_OF_RANGE = 61, /// - /// ( Mid Tank 6 Empty) + /// (Dryer zone 1 current loop break) /// - [Description(" Mid Tank 6 Empty")] - MidTank6Empty = 61, + [Description("Dryer zone 1 current loop break")] + DRYER_HEATERS_ZONE_1_CURRENT_LOOP_BREAK = 62, /// - /// ( Mid Tank 7 Empty) + /// (Dryer zone 2 current loop break) /// - [Description(" Mid Tank 7 Empty")] - MidTank7Empty = 62, + [Description("Dryer zone 2 current loop break")] + DRYER_HEATERS_ZONE_2_CURRENT_LOOP_BREAK = 63, /// - /// ( Mid Tank 8 Empty) + /// (Dryer fans RPM too low) /// - [Description(" Mid Tank 8 Empty")] - MidTank8Empty = 63, + [Description("Dryer fans RPM too low")] + DRYER_FAN_RPM_TOO_LOW = 64, /// - /// ( Mid Tank 1 Lowlevel) + /// (Dryer fan stopped) /// - [Description(" Mid Tank 1 Lowlevel")] - MidTank1Lowlevel = 64, + [Description("Dryer fan stopped")] + DRYER_FAN_STOPPED = 65, /// - /// ( Mid Tank 2 Lowlevel) + /// (Overtemperature in dyeing head zone 1) /// - [Description(" Mid Tank 2 Lowlevel")] - MidTank2Lowlevel = 65, + [Description("Overtemperature in dyeing head zone 1")] + DYEING_HEAD_ZONE_1_OVERTEMPERATURE = 66, /// - /// ( Mid Tank 3 Lowlevel) + /// (Overtemperature in dyeing head zone 2) /// - [Description(" Mid Tank 3 Lowlevel")] - MidTank3Lowlevel = 66, + [Description("Overtemperature in dyeing head zone 2")] + DYEING_HEAD_ZONE_2_OVERTEMPERATURE = 67, /// - /// ( Mid Tank 4 Lowlevel) + /// (Overtemperature in dyeing head zone 3) /// - [Description(" Mid Tank 4 Lowlevel")] - MidTank4Lowlevel = 67, + [Description("Overtemperature in dyeing head zone 3")] + DYEING_HEAD_ZONE_3_OVERTEMPERATURE = 68, /// - /// ( Mid Tank 5 Lowlevel) + /// (Overtemperature in dyeing head zone 4) /// - [Description(" Mid Tank 5 Lowlevel")] - MidTank5Lowlevel = 68, + [Description("Overtemperature in dyeing head zone 4")] + DYEING_HEAD_ZONE_4_OVERTEMPERATURE = 69, /// - /// ( Mid Tank 6 Lowlevel) + /// (Overtemperature in dyeing head zone 5) /// - [Description(" Mid Tank 6 Lowlevel")] - MidTank6Lowlevel = 69, + [Description("Overtemperature in dyeing head zone 5")] + DYEING_HEAD_ZONE_5_OVERTEMPERATURE = 70, /// - /// ( Mid Tank 7 Lowlevel) + /// (Overtemperature in dyeing head zone 6) /// - [Description(" Mid Tank 7 Lowlevel")] - MidTank7Lowlevel = 70, + [Description("Overtemperature in dyeing head zone 6")] + DYEING_HEAD_ZONE_6_OVERTEMPERATURE = 71, /// - /// ( Mid Tank 8 Lowlevel) + /// (Undertemperature in dyeing head zone 1) /// - [Description(" Mid Tank 8 Lowlevel")] - MidTank8Lowlevel = 71, + [Description("Undertemperature in dyeing head zone 1")] + DYEING_HEAD_ZONE_1_UNDERTEMPERATURE_A = 72, /// - /// ( Mid Tank 1 Not In Place) + /// (Undertemperature in dyeing head zone 2) /// - [Description(" Mid Tank 1 Not In Place")] - MidTank1NotInPlace = 72, + [Description("Undertemperature in dyeing head zone 2")] + DYEING_HEAD_ZONE_2_UNDERTEMPERATURE_A = 73, /// - /// ( Mid Tank 2 Not In Place) + /// (Undertemperature in dyeing head zone 3) /// - [Description(" Mid Tank 2 Not In Place")] - MidTank2NotInPlace = 73, + [Description("Undertemperature in dyeing head zone 3")] + DYEING_HEAD_ZONE_3_UNDERTEMPERATURE_A = 74, /// - /// ( Mid Tank 3 Not In Place) + /// (Undertemperature in dyeing head zone 4) /// - [Description(" Mid Tank 3 Not In Place")] - MidTank3NotInPlace = 74, + [Description("Undertemperature in dyeing head zone 4")] + DYEING_HEAD_ZONE_4_UNDERTEMPERATURE_A = 75, /// - /// ( Mid Tank 4 Not In Place) + /// (Undertemperature in dyeing head zone 5) /// - [Description(" Mid Tank 4 Not In Place")] - MidTank4NotInPlace = 75, + [Description("Undertemperature in dyeing head zone 5")] + DYEING_HEAD_ZONE_5_UNDERTEMPERATURE_A = 76, /// - /// ( Mid Tank 5 Not In Place) + /// (Undertemperature in dyeing head zone 6) /// - [Description(" Mid Tank 5 Not In Place")] - MidTank5NotInPlace = 76, + [Description("Undertemperature in dyeing head zone 6")] + DYEING_HEAD_ZONE_6_UNDERTEMPERATURE_A = 77, /// - /// ( Mid Tank 6 Not In Place) + /// (Undertemperature in dyeing head zone 1) /// - [Description(" Mid Tank 6 Not In Place")] - MidTank6NotInPlace = 77, + [Description("Undertemperature in dyeing head zone 1")] + DYEING_HEAD_ZONE_1_UNDERTEMPERATURE_B = 78, /// - /// ( Mid Tank 7 Not In Place) + /// (Undertemperature in dyeing head zone 2) /// - [Description(" Mid Tank 7 Not In Place")] - MidTank7NotInPlace = 78, + [Description("Undertemperature in dyeing head zone 2")] + DYEING_HEAD_ZONE_2_UNDERTEMPERATURE_B = 79, /// - /// ( Mid Tank 8 Not In Place) + /// (Undertemperature in dyeing head zone 3) /// - [Description(" Mid Tank 8 Not In Place")] - MidTank8NotInPlace = 79, + [Description("Undertemperature in dyeing head zone 3")] + DYEING_HEAD_ZONE_3_UNDERTEMPERATURE_B = 80, /// - /// ( System Built In Test Fail) + /// (Undertemperature in dyeing head zone 4) /// - [Description(" System Built In Test Fail")] - SystemBITFail = 80, + [Description("Undertemperature in dyeing head zone 4")] + DYEING_HEAD_ZONE_4_UNDERTEMPERATURE_B = 81, /// - /// ( General Internal Over Temperature) + /// (Undertemperature in dyeing head zone 5) /// - [Description(" General Internal Over Temperature")] - GeneralInternalOverTemperature = 81, + [Description("Undertemperature in dyeing head zone 5")] + DYEING_HEAD_ZONE_5_UNDERTEMPERATURE_B = 82, /// - /// ( Machine Cover Open) + /// (Undertemperature in dyeing head zone 6) /// - [Description(" Machine Cover Open")] - MachineCoverOpen = 82, + [Description("Undertemperature in dyeing head zone 6")] + DYEING_HEAD_ZONE_6_UNDERTEMPERATURE_B = 83, /// - /// ( Emergency Push Button Pressed) + /// (Dyeing head zone 1 current out of range) /// - [Description(" Emergency Push Button Pressed")] - EmergencyPushButtonPressed = 83, + [Description("Dyeing head zone 1 current out of range")] + DYEING_HEAD_ZONE_1_CURRENT_OUT_OF_RANGE = 84, /// - /// ( System General Error) + /// (Dyeing head zone 2 current out of range) /// - [Description(" System General Error")] - SystemGeneralError = 84, + [Description("Dyeing head zone 2 current out of range")] + DYEING_HEAD_ZONE_2_CURRENT_OUT_OF_RANGE = 85, /// - /// ( Motor Dryer Over Current) + /// (Dyeing head zone 3 current out of range) /// - [Description(" Motor Dryer Over Current")] - MotorDryerOverCurrent = 93, + [Description("Dyeing head zone 3 current out of range")] + DYEING_HEAD_ZONE_3_CURRENT_OUT_OF_RANGE = 86, /// - /// ( Motor Feeder Over Current) + /// (Dyeing head zone 4 current out of range) /// - [Description(" Motor Feeder Over Current")] - MotorFeederOverCurrent = 94, + [Description("Dyeing head zone 4 current out of range")] + DYEING_HEAD_ZONE_4_CURRENT_OUT_OF_RANGE = 87, /// - /// ( Motor Right Loader Over Current) + /// (Dyeing head zones 5 and 6 current out of range) /// - [Description(" Motor Right Loader Over Current")] - MotorRLoaderOverCurrent = 95, + [Description("Dyeing head zones 5 and 6 current out of range")] + DYEING_HEAD_ZONE_5_6_CURRENT_OUT_OF_RANGE = 88, /// - /// ( Motor Pooler Over Current) + /// (Dyeing head zone 1 current loop break) /// - [Description(" Motor Pooler Over Current")] - MotorPoolerOverCurrent = 96, + [Description("Dyeing head zone 1 current loop break")] + DYEING_HEAD_ZONE_1_CURRENT_LOOP_BREAK = 89, /// - /// ( Motor Left Loader Over Current) + /// (Dyeing head zone 2 current loop break) /// - [Description(" Motor Left Loader Over Current")] - MotorLLoaderOverCurrent = 97, + [Description("Dyeing head zone 2 current loop break")] + DYEING_HEAD_ZONE_2_CURRENT_LOOP_BREAK = 90, /// - /// ( Motor Winder Over Current) + /// (Dyeing head zone 3 current loop break) /// - [Description(" Motor Winder Over Current")] - MotorWinderOverCurrent = 98, + [Description("Dyeing head zone 3 current loop break")] + DYEING_HEAD_ZONE_3_CURRENT_LOOP_BREAK = 91, /// - /// ( Motor Screw Over Current) + /// (Dyeing head zone 4 current loop break) /// - [Description(" Motor Screw Over Current")] - MotorScrewOverCurrent = 99, + [Description("Dyeing head zone 4 current loop break")] + DYEING_HEAD_ZONE_4_CURRENT_LOOP_BREAK = 92, /// - /// ( Motor Loading Arm Over Current) + /// (Dyeing head zone 5 and 6 current loop break) /// - [Description(" Motor Loading Arm Over Current")] - MotorLoadingArmOverCurrent = 100, + [Description("Dyeing head zone 5 and 6 current loop break")] + DYEING_HEAD_ZONE_5_6_CURRENT_LOOP_BREAK = 93, /// - /// ( Motor Dispenser 1 Over Current) + /// (Overheating in dyeing head) /// - [Description(" Motor Dispenser 1 Over Current")] - MotorDispenser1OverCurrent = 101, + [Description("Overheating in dyeing head")] + DYEING_HEAD_THERMAL_CUTOFF = 94, /// - /// ( Motor Dispenser 2 Over Current) + /// (Could not open dyeing head cover) /// - [Description(" Motor Dispenser 2 Over Current")] - MotorDispenser2OverCurrent = 102, + [Description("Could not open dyeing head cover")] + DYEING_HEAD_COVER_OPEN_TIMEOUT = 95, /// - /// ( Motor Dispenser 3 Over Current) + /// (Could not close dyeing head cover ) /// - [Description(" Motor Dispenser 3 Over Current")] - MotorDispenser3OverCurrent = 103, + [Description("Could not close dyeing head cover ")] + DYEING_HEAD_COVER_CLOSE_TIMEOUT = 96, /// - /// ( Motor Dispenser 4 Over Current) + /// (Overtemperature in mixer) /// - [Description(" Motor Dispenser 4 Over Current")] - MotorDispenser4OverCurrent = 104, + [Description("Overtemperature in mixer")] + MIXER_OVERTEMPERATURE = 97, /// - /// ( Motor Dispenser 5 Over Current) + /// (Undertemperature in mixer) /// - [Description(" Motor Dispenser 5 Over Current")] - MotorDispenser5OverCurrent = 105, + [Description("Undertemperature in mixer")] + MIXER_UNDERTEMPERATURE_A = 98, /// - /// ( Motor Dispenser 6 Over Current) + /// (Undertemperature in mixer) /// - [Description(" Motor Dispenser 6 Over Current")] - MotorDispenser6OverCurrent = 106, + [Description("Undertemperature in mixer")] + MIXER_UNDERTEMPERATURE_B = 99, /// - /// ( Motor Dispenser 7 Over Current) + /// (Overheating in mixer) /// - [Description(" Motor Dispenser 7 Over Current")] - MotorDispenser7OverCurrent = 107, + [Description("Overheating in mixer")] + MIXER_THERMAL_CUTOFF = 100, /// - /// ( Motor Dispenser 8 Over Current) + /// (Mixer current out of range) /// - [Description(" Motor Dispenser 8 Over Current")] - MotorDispenser8OverCurrent = 108, + [Description("Mixer current out of range")] + MIXER_CURRENT_OUT_OF_RANGE = 101, /// - /// ( Motor Dryer Over Temperature) + /// (Mixer current loop break) /// - [Description(" Motor Dryer Over Temperature")] - MotorDryerOverTemperature = 109, + [Description("Mixer current loop break")] + MIXER_CURRENT_LOOP_BREAK = 102, /// - /// ( Motor Feeder Over Temperature) + /// (Overpressure in dispenser 1) /// - [Description(" Motor Feeder Over Temperature")] - MotorFeederOverTemperature = 110, + [Description("Overpressure in dispenser 1")] + DISPENSER_1_OVERPRESSURE = 103, /// - /// ( Motor Right Loader Over Temperature) + /// (Overpressure in dispenser 2) /// - [Description(" Motor Right Loader Over Temperature")] - MotorRLoaderOverTemperature = 111, + [Description("Overpressure in dispenser 2")] + DISPENSER_2_OVERPRESSURE = 104, /// - /// ( Motor Pooler Over Temperature) + /// (Overpressure in dispenser 3) /// - [Description(" Motor Pooler Over Temperature")] - MotorPoolerOverTemperature = 112, + [Description("Overpressure in dispenser 3")] + DISPENSER_3_OVERPRESSURE = 105, /// - /// ( Motor Left Loader Over Temperature) + /// (Overpressure in dispenser 4) /// - [Description(" Motor Left Loader Over Temperature")] - MotorLLoaderOverTemperature = 113, + [Description("Overpressure in dispenser 4")] + DISPENSER_4_OVERPRESSURE = 106, /// - /// ( Motor Winder Over Temperature) + /// (Overpressure in dispenser 5) /// - [Description(" Motor Winder Over Temperature")] - MotorWinderOverTemperature = 114, + [Description("Overpressure in dispenser 5")] + DISPENSER_5_OVERPRESSURE = 107, /// - /// ( Motor Screw Over Temperature) + /// (Overpressure in dispenser 6) /// - [Description(" Motor Screw Over Temperature")] - MotorScrewOverTemperature = 115, + [Description("Overpressure in dispenser 6")] + DISPENSER_6_OVERPRESSURE = 108, /// - /// ( Motor Loading Arm Over Temperature) + /// (Overpressure in dispenser 7) /// - [Description(" Motor Loading Arm Over Temperature")] - MotorLoadingArmOverTemperature = 116, + [Description("Overpressure in dispenser 7")] + DISPENSER_7_OVERPRESSURE = 109, /// - /// ( Motor Dispenser 1 Over Temperature) + /// (Overpressure in dispenser 8) /// - [Description(" Motor Dispenser 1 Over Temperature")] - MotorDispenser1OverTemperature = 117, + [Description("Overpressure in dispenser 8")] + DISPENSER_8_OVERPRESSURE = 110, /// - /// ( Motor Dispenser 2 Over Temperature) + /// (Underpressure in dispenser 1) /// - [Description(" Motor Dispenser 2 Over Temperature")] - MotorDispenser2OverTemperature = 118, + [Description("Underpressure in dispenser 1")] + DISPENSER_1_UNDERPRESSURE = 111, /// - /// ( Motor Dispenser 3 Over Temperature) + /// (Underpressure in dispenser 2) /// - [Description(" Motor Dispenser 3 Over Temperature")] - MotorDispenser3OverTemperature = 119, + [Description("Underpressure in dispenser 2")] + DISPENSER_2_UNDERPRESSURE = 112, /// - /// ( Motor Dispenser 4 Over Temperature) + /// (Underpressure in dispenser 3) /// - [Description(" Motor Dispenser 4 Over Temperature")] - MotorDispenser4OverTemperature = 120, + [Description("Underpressure in dispenser 3")] + DISPENSER_3_UNDERPRESSURE = 113, /// - /// ( Motor Dispenser 5 Over Temperature) + /// (Underpressure in dispenser 4) /// - [Description(" Motor Dispenser 5 Over Temperature")] - MotorDispenser5OverTemperature = 121, + [Description("Underpressure in dispenser 4")] + DISPENSER_4_UNDERPRESSURE = 114, /// - /// ( Motor Dispenser 6 Over Temperature) + /// (Underpressure in dispenser 5) /// - [Description(" Motor Dispenser 6 Over Temperature")] - MotorDispenser6OverTemperature = 122, + [Description("Underpressure in dispenser 5")] + DISPENSER_5_UNDERPRESSURE = 115, /// - /// ( Motor Dispenser 7 Over Temperature) + /// (Underpressure in dispenser 6) /// - [Description(" Motor Dispenser 7 Over Temperature")] - MotorDispenser7OverTemperature = 123, + [Description("Underpressure in dispenser 6")] + DISPENSER_6_UNDERPRESSURE = 116, /// - /// ( Motor Dispenser 8 Over Temperature) + /// (Underpressure in dispenser 7) /// - [Description(" Motor Dispenser 8 Over Temperature")] - MotorDispenser8OverTemperature = 124, + [Description("Underpressure in dispenser 7")] + DISPENSER_7_UNDERPRESSURE = 117, /// - /// ( Motor Dryer Stall) + /// (Underpressure in dispenser 8) /// - [Description(" Motor Dryer Stall")] - MotorDryerStall = 125, + [Description("Underpressure in dispenser 8")] + DISPENSER_8_UNDERPRESSURE = 118, /// - /// ( Motor Feeder Stall) + /// (Dispenser 1 empty) /// - [Description(" Motor Feeder Stall")] - MotorFeederStall = 126, + [Description("Dispenser 1 empty")] + DISPENSER_1_EMPTY = 119, /// - /// ( Motor Right Loader Stall) + /// (Dispenser 2 empty) /// - [Description(" Motor Right Loader Stall")] - MotorRLoaderStall = 127, + [Description("Dispenser 2 empty")] + DISPENSER_2_EMPTY = 120, /// - /// ( Motor Pooler Stall) + /// (Dispenser 3 empty) /// - [Description(" Motor Pooler Stall")] - MotorPoolerStall = 128, + [Description("Dispenser 3 empty")] + DISPENSER_3_EMPTY = 121, /// - /// ( Motor Left Loader Stall) + /// (Dispenser 4 empty) /// - [Description(" Motor Left Loader Stall")] - MotorLLoaderStall = 129, + [Description("Dispenser 4 empty")] + DISPENSER_4_EMPTY = 122, /// - /// ( Motor Winder Stall) + /// (Dispenser 5 empty) /// - [Description(" Motor Winder Stall")] - MotorWinderStall = 130, + [Description("Dispenser 5 empty")] + DISPENSER_5_EMPTY = 123, /// - /// ( Motor Screw Stall) + /// (Dispenser 6 empty) /// - [Description(" Motor Screw Stall")] - MotorScrewStall = 131, + [Description("Dispenser 6 empty")] + DISPENSER_6_EMPTY = 124, /// - /// ( Motor Loading Arm Stall) + /// (Dispenser 7 empty) /// - [Description(" Motor Loading Arm Stall")] - MotorLoadingArmStall = 132, + [Description("Dispenser 7 empty")] + DISPENSER_7_EMPTY = 125, /// - /// ( Motor Dispenser 1 Stall) + /// (Dispenser 8 empty) /// - [Description(" Motor Dispenser 1 Stall")] - MotorDispenser1Stall = 133, + [Description("Dispenser 8 empty")] + DISPENSER_8_EMPTY = 126, /// - /// ( Motor Dispenser 2 Stall) + /// (Failed to refill dispenser 1) /// - [Description(" Motor Dispenser 2 Stall")] - MotorDispenser2Stall = 134, + [Description("Failed to refill dispenser 1")] + DISPENSER_1_REFILL_FAILURE = 127, /// - /// ( Motor Dispenser 3 Stall) + /// (Failed to refill dispenser 2) /// - [Description(" Motor Dispenser 3 Stall")] - MotorDispenser3Stall = 135, + [Description("Failed to refill dispenser 2")] + DISPENSER_2_REFILL_FAILURE = 128, /// - /// ( Motor Dispenser 4 Stall) + /// (Failed to refill dispenser 3) /// - [Description(" Motor Dispenser 4 Stall")] - MotorDispenser4Stall = 136, + [Description("Failed to refill dispenser 3")] + DISPENSER_3_REFILL_FAILURE = 129, /// - /// ( Motor Dispenser 5 Stall) + /// (Failed to refill dispenser 4) /// - [Description(" Motor Dispenser 5 Stall")] - MotorDispenser5Stall = 137, + [Description("Failed to refill dispenser 4")] + DISPENSER_4_REFILL_FAILURE = 130, /// - /// ( Motor Dispenser 6 Stall) + /// (Failed to refill dispenser 5) /// - [Description(" Motor Dispenser 6 Stall")] - MotorDispenser6Stall = 138, + [Description("Failed to refill dispenser 5")] + DISPENSER_5_REFILL_FAILURE = 131, /// - /// ( Motor Dispenser 7 Stall) + /// (Failed to refill dispenser 6) /// - [Description(" Motor Dispenser 7 Stall")] - MotorDispenser7Stall = 139, + [Description("Failed to refill dispenser 6")] + DISPENSER_6_REFILL_FAILURE = 132, /// - /// ( Motor Dispenser 8 Stall) + /// (Failed to refill dispenser 7) /// - [Description(" Motor Dispenser 8 Stall")] - MotorDispenser8Stall = 140, + [Description("Failed to refill dispenser 7")] + DISPENSER_7_REFILL_FAILURE = 133, /// - /// ( Motor Dryer Under Voltage) + /// (Failed to refill dispenser 8) /// - [Description(" Motor Dryer Under Voltage")] - MotorDryerUnderVoltage = 141, + [Description("Failed to refill dispenser 8")] + DISPENSER_8_REFILL_FAILURE = 134, /// - /// ( Motor Feeder Under Voltage) + /// (Overcurrent in dispenser 1 motor) /// - [Description(" Motor Feeder Under Voltage")] - MotorFeederUnderVoltage = 142, + [Description("Overcurrent in dispenser 1 motor")] + DISPENSER_1_MOTOR_OVERCURRENT = 135, /// - /// ( Motor Right Loader Under Voltage) + /// (Overcurrent in dispenser 2 motor) /// - [Description(" Motor Right Loader Under Voltage")] - MotorRLoaderUnderVoltage = 143, + [Description("Overcurrent in dispenser 2 motor")] + DISPENSER_2_MOTOR_OVERCURRENT = 136, /// - /// ( Motor Pooler Under Voltage) + /// (Overcurrent in dispenser 3 motor) /// - [Description(" Motor Pooler Under Voltage")] - MotorPoolerUnderVoltage = 144, + [Description("Overcurrent in dispenser 3 motor")] + DISPENSER_3_MOTOR_OVERCURRENT = 137, /// - /// ( Motor Left Loader Under Voltage) + /// (Overcurrent in dispenser 4 motor) /// - [Description(" Motor Left Loader Under Voltage")] - MotorLLoaderUnderVoltage = 145, + [Description("Overcurrent in dispenser 4 motor")] + DISPENSER_4_MOTOR_OVERCURRENT = 138, /// - /// ( Motor Winder Under Voltage) + /// (Overcurrent in dispenser 5 motor) /// - [Description(" Motor Winder Under Voltage")] - MotorWinderUnderVoltage = 146, + [Description("Overcurrent in dispenser 5 motor")] + DISPENSER_5_MOTOR_OVERCURRENT = 139, /// - /// ( Motor Screw Under Voltage) + /// (Overcurrent in dispenser 6 motor) /// - [Description(" Motor Screw Under Voltage")] - MotorScrewUnderVoltage = 147, + [Description("Overcurrent in dispenser 6 motor")] + DISPENSER_6_MOTOR_OVERCURRENT = 140, /// - /// ( Motor Loading Arm Under Voltage) + /// (Overcurrent in dispenser 7 motor) /// - [Description(" Motor Loading Arm Under Voltage")] - MotorLoadingArmUnderVoltage = 148, + [Description("Overcurrent in dispenser 7 motor")] + DISPENSER_7_MOTOR_OVERCURRENT = 141, /// - /// ( Motor Dispenser 1 Under Voltage) + /// (Overcurrent in dispenser 8 motor) /// - [Description(" Motor Dispenser 1 Under Voltage")] - MotorDispenser1UnderVoltage = 149, + [Description("Overcurrent in dispenser 8 motor")] + DISPENSER_8_MOTOR_OVERCURRENT = 142, /// - /// ( Motor Dispenser 2 Under Voltage) + /// (Overtemperature in dispenser 1 motor) /// - [Description(" Motor Dispenser 2 Under Voltage")] - MotorDispenser2UnderVoltage = 150, + [Description("Overtemperature in dispenser 1 motor")] + DISPENSER_1_MOTOR_OVERTEMPERATURE = 143, /// - /// ( Motor Dispenser 3 Under Voltage) + /// (Overtemperature in dispenser 2 motor) /// - [Description(" Motor Dispenser 3 Under Voltage")] - MotorDispenser3UnderVoltage = 151, + [Description("Overtemperature in dispenser 2 motor")] + DISPENSER_2_MOTOR_OVERTEMPERATURE = 144, /// - /// ( Motor Dispenser 4 Under Voltage) + /// (Overtemperature in dispenser 3 motor) /// - [Description(" Motor Dispenser 4 Under Voltage")] - MotorDispenser4UnderVoltage = 152, + [Description("Overtemperature in dispenser 3 motor")] + DISPENSER_3_MOTOR_OVERTEMPERATURE = 145, /// - /// ( Motor Dispenser 5 Under Voltage) + /// (Overtemperature in dispenser 4 motor) /// - [Description(" Motor Dispenser 5 Under Voltage")] - MotorDispenser5UnderVoltage = 153, + [Description("Overtemperature in dispenser 4 motor")] + DISPENSER_4_MOTOR_OVERTEMPERATURE = 146, /// - /// ( Motor Dispenser 6 Under Voltage) + /// (Overtemperature in dispenser 5 motor) /// - [Description(" Motor Dispenser 6 Under Voltage")] - MotorDispenser6UnderVoltage = 154, + [Description("Overtemperature in dispenser 5 motor")] + DISPENSER_5_MOTOR_OVERTEMPERATURE = 147, /// - /// ( Motor Dispenser 7 Under Voltage) + /// (Overtemperature in dispenser 6 motor) /// - [Description(" Motor Dispenser 7 Under Voltage")] - MotorDispenser7UnderVoltage = 155, + [Description("Overtemperature in dispenser 6 motor")] + DISPENSER_6_MOTOR_OVERTEMPERATURE = 148, /// - /// ( Motor Dispenser 8 Under Voltage) + /// (Overtemperature in dispenser 7 motor) /// - [Description(" Motor Dispenser 8 Under Voltage")] - MotorDispenser8UnderVoltage = 156, + [Description("Overtemperature in dispenser 7 motor")] + DISPENSER_7_MOTOR_OVERTEMPERATURE = 149, + + /// + /// (Overtemperature in dispenser 8 motor) + /// + [Description("Overtemperature in dispenser 8 motor")] + DISPENSER_8_MOTOR_OVERTEMPERATURE = 150, + + /// + /// (Dispenser 1 motor stalled) + /// + [Description("Dispenser 1 motor stalled")] + DISPENSER_1_MOTOR_STALL = 151, + + /// + /// (Dispenser 2 motor stalled) + /// + [Description("Dispenser 2 motor stalled")] + DISPENSER_2_MOTOR_STALL = 152, + + /// + /// (Dispenser 3 motor stalled) + /// + [Description("Dispenser 3 motor stalled")] + DISPENSER_3_MOTOR_STALL = 153, + + /// + /// (Dispenser 4 motor stalled) + /// + [Description("Dispenser 4 motor stalled")] + DISPENSER_4_MOTOR_STALL = 154, + + /// + /// (Dispenser 5 motor stalled) + /// + [Description("Dispenser 5 motor stalled")] + DISPENSER_5_MOTOR_STALL = 155, + + /// + /// (Dispenser 6 motor stalled) + /// + [Description("Dispenser 6 motor stalled")] + DISPENSER_6_MOTOR_STALL = 156, + + /// + /// (Dispenser 7 motor stalled) + /// + [Description("Dispenser 7 motor stalled")] + DISPENSER_7_MOTOR_STALL = 157, + + /// + /// (Dispenser 8 motor stalled) + /// + [Description("Dispenser 8 motor stalled")] + DISPENSER_8_MOTOR_STALL = 158, + + /// + /// (Undervoltage in dispenser 1 motor) + /// + [Description("Undervoltage in dispenser 1 motor")] + DISPENSER_1_MOTOR_UNDERVOLTAGE = 159, + + /// + /// (Undervoltage in dispenser 2 motor) + /// + [Description("Undervoltage in dispenser 2 motor")] + DISPENSER_2_MOTOR_UNDERVOLTAGE = 160, + + /// + /// (Undervoltage in dispenser 3 motor) + /// + [Description("Undervoltage in dispenser 3 motor")] + DISPENSER_3_MOTOR_UNDERVOLTAGE = 161, + + /// + /// (Undervoltage in dispenser 4 motor) + /// + [Description("Undervoltage in dispenser 4 motor")] + DISPENSER_4_MOTOR_UNDERVOLTAGE = 162, + + /// + /// (Undervoltage in dispenser 5 motor) + /// + [Description("Undervoltage in dispenser 5 motor")] + DISPENSER_5_MOTOR_UNDERVOLTAGE = 163, + + /// + /// (Undervoltage in dispenser 6 motor) + /// + [Description("Undervoltage in dispenser 6 motor")] + DISPENSER_6_MOTOR_UNDERVOLTAGE = 164, + + /// + /// (Undervoltage in dispenser 7 motor) + /// + [Description("Undervoltage in dispenser 7 motor")] + DISPENSER_7_MOTOR_UNDERVOLTAGE = 165, + + /// + /// (Undervoltage in dispenser 8 motor) + /// + [Description("Undervoltage in dispenser 8 motor")] + DISPENSER_8_MOTOR_UNDERVOLTAGE = 166, + + /// + /// (Low level in mid-tank 1) + /// + [Description("Low level in mid-tank 1")] + MID_TANK_1_LOW_LEVEL = 167, + + /// + /// (Low level in mid-tank 2) + /// + [Description("Low level in mid-tank 2")] + MID_TANK_2_LOW_LEVEL = 168, + + /// + /// (Low level in mid-tank 3) + /// + [Description("Low level in mid-tank 3")] + MID_TANK_3_LOW_LEVEL = 169, + + /// + /// (Low level in mid-tank 4) + /// + [Description("Low level in mid-tank 4")] + MID_TANK_4_LOW_LEVEL = 170, + + /// + /// (Low level in mid-tank 5) + /// + [Description("Low level in mid-tank 5")] + MID_TANK_5_LOW_LEVEL = 171, + + /// + /// (Low level in mid-tank 6) + /// + [Description("Low level in mid-tank 6")] + MID_TANK_6_LOW_LEVEL = 172, + + /// + /// (Low level in mid-tank 7) + /// + [Description("Low level in mid-tank 7")] + MID_TANK_7_LOW_LEVEL = 173, + + /// + /// (Low level in mid-tank 8) + /// + [Description("Low level in mid-tank 8")] + MID_TANK_8_LOW_LEVEL = 174, + + /// + /// (Mid-tank 1 empty) + /// + [Description("Mid-tank 1 empty")] + MID_TANK_1_EMPTY = 175, + + /// + /// (Mid-tank 2 empty) + /// + [Description("Mid-tank 2 empty")] + MID_TANK_2_EMPTY = 176, + + /// + /// (Mid-tank 3 empty) + /// + [Description("Mid-tank 3 empty")] + MID_TANK_3_EMPTY = 177, + + /// + /// (Mid-tank 4 empty) + /// + [Description("Mid-tank 4 empty")] + MID_TANK_4_EMPTY = 178, + + /// + /// (Mid-tank 5 empty) + /// + [Description("Mid-tank 5 empty")] + MID_TANK_5_EMPTY = 179, + + /// + /// (Mid-tank 6 empty) + /// + [Description("Mid-tank 6 empty")] + MID_TANK_6_EMPTY = 180, + + /// + /// (Mid-tank 7 empty) + /// + [Description("Mid-tank 7 empty")] + MID_TANK_7_EMPTY = 181, + + /// + /// (Mid-tank 8 empty) + /// + [Description("Mid-tank 8 empty")] + MID_TANK_8_EMPTY = 182, + + /// + /// (Overflow in mid-tank 1) + /// + [Description("Overflow in mid-tank 1")] + MID_TANK_1_OVERFLOW = 183, + + /// + /// (Overflow in mid-tank 2) + /// + [Description("Overflow in mid-tank 2")] + MID_TANK_2_OVERFLOW = 184, + + /// + /// (Overflow in mid-tank 3) + /// + [Description("Overflow in mid-tank 3")] + MID_TANK_3_OVERFLOW = 185, + + /// + /// (Overflow in mid-tank 4) + /// + [Description("Overflow in mid-tank 4")] + MID_TANK_4_OVERFLOW = 186, + + /// + /// (Overflow in mid-tank 5) + /// + [Description("Overflow in mid-tank 5")] + MID_TANK_5_OVERFLOW = 187, + + /// + /// (Overflow in mid-tank 6) + /// + [Description("Overflow in mid-tank 6")] + MID_TANK_6_OVERFLOW = 188, + + /// + /// (Overflow in mid-tank 7) + /// + [Description("Overflow in mid-tank 7")] + MID_TANK_7_OVERFLOW = 189, + + /// + /// (Overflow in mid-tank 8) + /// + [Description("Overflow in mid-tank 8")] + MID_TANK_8_OVERFLOW = 190, + + /// + /// (Air filter not present) + /// + [Description("Air filter not present")] + AIR_FILTER_NOT_INSTALLED = 191, + + /// + /// (Air filter clogged) + /// + [Description("Air filter clogged")] + AIR_FILTER_CLOGGED = 192, + + /// + /// (Waste emptying failure) + /// + [Description("Waste emptying failure")] + WASTE_CONTAINER_EMPTYING_TIMEOUT = 193, + + /// + /// (No air pressure) + /// + [Description("No air pressure")] + NO_AIR_PRESSURE = 194, + + /// + /// (Overflow in waste container) + /// + [Description("Overflow in waste container")] + WASTE_CONTAINER_OVERFLOW = 195, + + /// + /// () + /// + [Description("")] + VOC_SENSOR_ALARM = 196, + + /// + /// (Chiller malfunction) + /// + [Description("Chiller malfunction")] + CHILLER_DRY_CONTACT = 197, + + /// + /// (Insufficient air flow) + /// + [Description("Insufficient air flow")] + INSUFFICIENT_AIR_FLOW = 198, + + /// + /// (Ink cartridge presence failure) + /// + [Description("Ink cartridge presence failure")] + INK_CARTRIDGE_PRESENCE_SENSOR_TIMEOUT = 199, + + /// + /// (Ink cartridge identification failure) + /// + [Description("Ink cartridge identification failure")] + INK_CARTRIDGE_RFID_TIMEOUT = 200, + + /// + /// (No waste cartridge available) + /// + [Description("No waste cartridge available")] + NO_WASTE_CARTRIDGE_AVAILABLE = 201, + + /// + /// (All waste cartridges are full) + /// + [Description("All waste cartridges are full")] + ALL_WASTE_CARTRIDGES_FULL = 202, + + /// + /// (Waste cartridge presence failure) + /// + [Description("Waste cartridge presence failure")] + WASTE_CARTRIDGE_PRESENCE_SENSOR_TIMEOUT = 203, + + /// + /// (Waste cartridge identification failure) + /// + [Description("Waste cartridge identification failure")] + WASTE_CARTRIDGE_RFID_TIMEOUT = 204, + + /// + /// (Electrical cabinet fans RPM too low) + /// + [Description("Electrical cabinet fans RPM too low")] + ELECTRICAL_CABINET_FANS_RPM_TOO_LOW = 205, + + /// + /// (Electrical cabinet fans stopped) + /// + [Description("Electrical cabinet fans stopped")] + ELECTRICAL_CABINET_FANS_STOPPED = 206, /// /// (Occurs a request has been sent to the machine or external bridge service) /// [Description("Occurs a request has been sent to the machine or external bridge service")] - RequestSent = 1000, + REQUEST_SENT = 1000, /// /// (Occures when a response has been received) /// [Description("Occures when a response has been received")] - ResponseReceived = 1001, + RESPONSE_RECEIVED = 1001, /// /// (Occures when a request to the machine has failed) /// [Description("Occures when a request to the machine has failed")] - RequestFailed = 1002, + REQUEST_FAILED = 1002, /// /// (Occures when the application has encountered some error) /// [Description("Occures when the application has encountered some error")] - ApplicationException = 1003, + APPLICATION_EXCEPTION = 1003, /// /// (General application event logs) /// [Description("General application event logs")] - ApplicationInformation = 1004, + APPLICATION_INFORMATION = 1004, /// /// (Notifies about application succesfully started) /// [Description("Notifies about application succesfully started")] - ApplicationStarted = 1005, + APPLICATION_STARTED = 1005, /// /// (Notifies about application termination) /// [Description("Notifies about application termination")] - ApplicationTerminated = 1006, + APPLICATION_TERMINATED = 1006, /// /// (Occures when a diagnostics recording has been started) /// [Description("Occures when a diagnostics recording has been started")] - RecordingStarted = 1007, + RECORDING_STARTED = 1007, /// /// (Occures when a diagnostics recording has been stopped) /// [Description("Occures when a diagnostics recording has been stopped")] - RecordingStopped = 1008, + RECORDING_STOPPED = 1008, /// /// (Occures when a job status message has been received from the embedded device) /// [Description("Occures when a job status message has been received from the embedded device")] - JobStatus = 1009, + JOB_STATUS = 1009, } } diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/EventTypesCategories.cs b/Software/Visual_Studio/Tango.BL/Enumerations/EventTypesCategories.cs deleted file mode 100644 index 2d0488430..000000000 --- a/Software/Visual_Studio/Tango.BL/Enumerations/EventTypesCategories.cs +++ /dev/null @@ -1,47 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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! -// -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.ComponentModel; - -namespace Tango.BL.Enumerations -{ - public enum EventTypesCategories - { - - /// - /// (General information) - /// - [Description("General information")] - Info = 0, - - /// - /// (Hardware or software warning) - /// - [Description("Hardware or software warning")] - Warning = 1, - - /// - /// (Hardware or software error) - /// - [Description("Hardware or software error")] - Error = 2, - - /// - /// (Critical hardware or software error) - /// - [Description("Critical hardware or software error")] - Critical = 3, - - } -} diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/EventTypesGroups.cs b/Software/Visual_Studio/Tango.BL/Enumerations/EventTypesGroups.cs deleted file mode 100644 index f13f432f0..000000000 --- a/Software/Visual_Studio/Tango.BL/Enumerations/EventTypesGroups.cs +++ /dev/null @@ -1,71 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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! -// -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.ComponentModel; - -namespace Tango.BL.Enumerations -{ - public enum EventTypesGroups - { - - /// - /// (Thread Feeding System) - /// - [Description("Thread Feeding System")] - ThreadFeedingSystem = 0, - - /// - /// (Dryer Head) - /// - [Description("Dryer Head")] - DryerHead = 1, - - /// - /// (Dryer) - /// - [Description("Dryer")] - Dryer = 2, - - /// - /// (Waste Handling System (WHS)) - /// - [Description("Waste Handling System (WHS)")] - WasteHandlingSystem = 3, - - /// - /// (Ink Delivery System (IDS)) - /// - [Description("Ink Delivery System (IDS)")] - InkDeliverySystem = 4, - - /// - /// (General Hardware) - /// - [Description("General Hardware")] - GeneralHardware = 5, - - /// - /// (Application related events) - /// - [Description("Application related events")] - Application = 6, - - /// - /// (Messages exchange to and from the machine) - /// - [Description("Messages exchange to and from the machine")] - Transport = 7, - - } -} diff --git a/Software/Visual_Studio/Tango.BL/ObservableEntity.cs b/Software/Visual_Studio/Tango.BL/ObservableEntity.cs index bee94552e..b59ba8925 100644 --- a/Software/Visual_Studio/Tango.BL/ObservableEntity.cs +++ b/Software/Visual_Studio/Tango.BL/ObservableEntity.cs @@ -381,6 +381,10 @@ Maybe you have deleted an entity that was no yet inserted into database?", LogCa return GetDbContextFromEntity(this); } + #endregion + + #region Serialization + public virtual EntitySerializationStrategy GetDefaultSerializationStrategy(EntitySerializationFlags flags) { EntitySerializationStrategy st = new EntitySerializationStrategy(); @@ -474,35 +478,26 @@ Maybe you have deleted an entity that was no yet inserted into database?", LogCa return ToJson(new EntitySerializationStrategy(), EntitySerializationFlags.IgnoreReferenceTypes | EntitySerializationFlags.Indented); } - public void PopulateFromJson(string json) + public void PopulateFromJson(string json, EntitySerializationStrategy serializationStrategy, EntitySerializationFlags flags) { - //JsonCobnve - - //JObject from = JObject.Parse(json); - //JObject entity = new JObject(this); - //from.Merge() - - //Person p = new Person() - //{ - // Age = 30, - // Name = "Roy", - //}; + var settings = new JsonSerializerSettings() + { + ContractResolver = new SerializableEntityContractResolver(serializationStrategy, flags), + }; - //Person p2 = new Person(); - //p2.Adderess = new Address() - //{ - // City = "Gan Yavne", - // Street = "Yohanan" - //}; + if (flags.HasFlag(EntitySerializationFlags.PreserveReferencesHandling)) + { + settings.PreserveReferencesHandling = PreserveReferencesHandling.All; + } - //String j1 = JsonConvert.SerializeObject(p); - //String j2 = JsonConvert.SerializeObject(p2); + settings.Converters.Add(new StringEnumConverter { CamelCaseText = false }); - //JsonConvert.PopulateObject(j2, p, new JsonSerializerSettings() - //{ - // NullValueHandling = NullValueHandling.Ignore, + JsonConvert.PopulateObject(json, this, settings); + } - //}); + public void PopulateFromJson(string json) + { + PopulateFromJson(json, new EntitySerializationStrategy(), EntitySerializationFlags.PreserveReferencesHandling); } #endregion diff --git a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs index 917755d09..27e4ee6a7 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs @@ -30,14 +30,6 @@ namespace Tango.BL get; set; } - /// - /// Gets or sets the ActionTypes. - /// - public DbSet ActionTypes - { - get; set; - } - /// /// Gets or sets the Addresses. /// @@ -174,30 +166,6 @@ namespace Tango.BL get; set; } - /// - /// Gets or sets the EventTypesActions. - /// - public DbSet EventTypesActions - { - get; set; - } - - /// - /// Gets or sets the EventTypesCategories. - /// - public DbSet EventTypesCategories - { - get; set; - } - - /// - /// Gets or sets the EventTypesGroups. - /// - public DbSet EventTypesGroups - { - get; set; - } - /// /// Gets or sets the FiberShapes. /// @@ -334,14 +302,6 @@ namespace Tango.BL get; set; } - /// - /// Gets or sets the HtmlPages. - /// - public DbSet HtmlPages - { - get; set; - } - /// /// Gets or sets the IdsPackFormulas. /// diff --git a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapter.cs b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapter.cs index 9c787cd0b..947d27565 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapter.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapter.cs @@ -174,21 +174,8 @@ namespace Tango.BL SpoolTypes = Context.SpoolTypes.ToObservableCollection(); - ActionTypes = Context.ActionTypes.ToObservableCollection(); - - EventTypesCategories = Context.EventTypesCategories.ToObservableCollection(); - - EventTypesGroups = Context.EventTypesGroups.ToObservableCollection(); - - EventTypesActions = Context.EventTypesActions.ToObservableCollection(); - EventTypes = Context.EventTypes.ToObservableCollection(); - foreach (var eventType in EventTypes) - { - eventType.EventTypesActions = eventType.EventTypesActions.ToSynchronizedObservableCollection(); - } - MediaMaterials = Context.MediaMaterials.ToObservableCollection(); MediaColors = Context.MediaColors.ToObservableCollection(); @@ -264,8 +251,6 @@ namespace Tango.BL HardwareBreakSensors = Context.HardwareBreakSensors.ToObservableCollection(); - HtmlPages = Context.HtmlPages.ToObservableCollection(); - Customers = Context.Customers.ToObservableCollection(); _dispatcher = Application.Current.Dispatcher; diff --git a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs index 6eea6ee9a..57f01105e 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs @@ -53,42 +53,6 @@ namespace Tango.BL } - private ObservableCollection _actiontypes; - /// - /// Gets or sets the ActionTypes. - /// - public ObservableCollection ActionTypes - { - get - { - return _actiontypes; - } - - set - { - _actiontypes = value; RaisePropertyChanged(nameof(ActionTypes)); - } - - } - - private ICollectionView _actiontypesViewSource; - /// - /// Gets or sets the ActionTypes View Source. - /// - public ICollectionView ActionTypesViewSource - { - get - { - return _actiontypesViewSource; - } - - set - { - _actiontypesViewSource = value; RaisePropertyChanged(nameof(ActionTypesViewSource)); - } - - } - private ObservableCollection
_addresses; /// /// Gets or sets the Addresses. @@ -701,114 +665,6 @@ namespace Tango.BL } - private ObservableCollection _eventtypesactions; - /// - /// Gets or sets the EventTypesActions. - /// - public ObservableCollection EventTypesActions - { - get - { - return _eventtypesactions; - } - - set - { - _eventtypesactions = value; RaisePropertyChanged(nameof(EventTypesActions)); - } - - } - - private ICollectionView _eventtypesactionsViewSource; - /// - /// Gets or sets the EventTypesActions View Source. - /// - public ICollectionView EventTypesActionsViewSource - { - get - { - return _eventtypesactionsViewSource; - } - - set - { - _eventtypesactionsViewSource = value; RaisePropertyChanged(nameof(EventTypesActionsViewSource)); - } - - } - - private ObservableCollection _eventtypescategories; - /// - /// Gets or sets the EventTypesCategories. - /// - public ObservableCollection EventTypesCategories - { - get - { - return _eventtypescategories; - } - - set - { - _eventtypescategories = value; RaisePropertyChanged(nameof(EventTypesCategories)); - } - - } - - private ICollectionView _eventtypescategoriesViewSource; - /// - /// Gets or sets the EventTypesCategories View Source. - /// - public ICollectionView EventTypesCategoriesViewSource - { - get - { - return _eventtypescategoriesViewSource; - } - - set - { - _eventtypescategoriesViewSource = value; RaisePropertyChanged(nameof(EventTypesCategoriesViewSource)); - } - - } - - private ObservableCollection _eventtypesgroups; - /// - /// Gets or sets the EventTypesGroups. - /// - public ObservableCollection EventTypesGroups - { - get - { - return _eventtypesgroups; - } - - set - { - _eventtypesgroups = value; RaisePropertyChanged(nameof(EventTypesGroups)); - } - - } - - private ICollectionView _eventtypesgroupsViewSource; - /// - /// Gets or sets the EventTypesGroups View Source. - /// - public ICollectionView EventTypesGroupsViewSource - { - get - { - return _eventtypesgroupsViewSource; - } - - set - { - _eventtypesgroupsViewSource = value; RaisePropertyChanged(nameof(EventTypesGroupsViewSource)); - } - - } - private ObservableCollection _fibershapes; /// /// Gets or sets the FiberShapes. @@ -1421,42 +1277,6 @@ namespace Tango.BL } - private ObservableCollection _htmlpages; - /// - /// Gets or sets the HtmlPages. - /// - public ObservableCollection HtmlPages - { - get - { - return _htmlpages; - } - - set - { - _htmlpages = value; RaisePropertyChanged(nameof(HtmlPages)); - } - - } - - private ICollectionView _htmlpagesViewSource; - /// - /// Gets or sets the HtmlPages View Source. - /// - public ICollectionView HtmlPagesViewSource - { - get - { - return _htmlpagesViewSource; - } - - set - { - _htmlpagesViewSource = value; RaisePropertyChanged(nameof(HtmlPagesViewSource)); - } - - } - private ObservableCollection _idspackformulas; /// /// Gets or sets the IdsPackFormulas. @@ -2797,8 +2617,6 @@ namespace Tango.BL SyncConfigurationsViewSource = CreateCollectionView(SyncConfigurations); - ActionTypesViewSource = CreateCollectionView(ActionTypes); - AddressesViewSource = CreateCollectionView(Addresses); ApplicationDisplayPanelVersionsViewSource = CreateCollectionView(ApplicationDisplayPanelVersions); @@ -2833,12 +2651,6 @@ namespace Tango.BL EventTypesViewSource = CreateCollectionView(EventTypes); - EventTypesActionsViewSource = CreateCollectionView(EventTypesActions); - - EventTypesCategoriesViewSource = CreateCollectionView(EventTypesCategories); - - EventTypesGroupsViewSource = CreateCollectionView(EventTypesGroups); - FiberShapesViewSource = CreateCollectionView(FiberShapes); FiberSynthsViewSource = CreateCollectionView(FiberSynths); @@ -2873,8 +2685,6 @@ namespace Tango.BL HardwareWindersViewSource = CreateCollectionView(HardwareWinders); - HtmlPagesViewSource = CreateCollectionView(HtmlPages); - IdsPackFormulasViewSource = CreateCollectionView(IdsPackFormulas); IdsPacksViewSource = CreateCollectionView(IdsPacks); diff --git a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollections.cs b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollections.cs index fb02494dd..a4b36b739 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollections.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollections.cs @@ -65,11 +65,7 @@ namespace Tango.BL ColorSpaces = db.ColorSpaces.ToObservableCollection(); SpoolTypes = db.SpoolTypes.ToObservableCollection(); - ActionTypes = db.ActionTypes.ToObservableCollection(); EventTypes = db.EventTypes.ToObservableCollection(); - EventTypesActions = db.EventTypesActions.ToObservableCollection(); - EventTypesCategories = db.EventTypesCategories.ToObservableCollection(); - EventTypesGroups = db.EventTypesGroups.ToObservableCollection(); HardwareBlowerTypes = db.HardwareBlowerTypes.ToObservableCollection(); HardwareBlowers = db.HardwareBlowers.ToObservableCollection(); diff --git a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs index 4de477ebb..096cd2687 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs @@ -53,42 +53,6 @@ namespace Tango.BL } - private ObservableCollection _actiontypes; - /// - /// Gets or sets the ActionTypes. - /// - public ObservableCollection ActionTypes - { - get - { - return _actiontypes; - } - - set - { - _actiontypes = value; RaisePropertyChanged(nameof(ActionTypes)); - } - - } - - private ICollectionView _actiontypesViewSource; - /// - /// Gets or sets the ActionTypes View Source. - /// - public ICollectionView ActionTypesViewSource - { - get - { - return _actiontypesViewSource; - } - - set - { - _actiontypesViewSource = value; RaisePropertyChanged(nameof(ActionTypesViewSource)); - } - - } - private ObservableCollection
_addresses; /// /// Gets or sets the Addresses. @@ -701,114 +665,6 @@ namespace Tango.BL } - private ObservableCollection _eventtypesactions; - /// - /// Gets or sets the EventTypesActions. - /// - public ObservableCollection EventTypesActions - { - get - { - return _eventtypesactions; - } - - set - { - _eventtypesactions = value; RaisePropertyChanged(nameof(EventTypesActions)); - } - - } - - private ICollectionView _eventtypesactionsViewSource; - /// - /// Gets or sets the EventTypesActions View Source. - /// - public ICollectionView EventTypesActionsViewSource - { - get - { - return _eventtypesactionsViewSource; - } - - set - { - _eventtypesactionsViewSource = value; RaisePropertyChanged(nameof(EventTypesActionsViewSource)); - } - - } - - private ObservableCollection _eventtypescategories; - /// - /// Gets or sets the EventTypesCategories. - /// - public ObservableCollection EventTypesCategories - { - get - { - return _eventtypescategories; - } - - set - { - _eventtypescategories = value; RaisePropertyChanged(nameof(EventTypesCategories)); - } - - } - - private ICollectionView _eventtypescategoriesViewSource; - /// - /// Gets or sets the EventTypesCategories View Source. - /// - public ICollectionView EventTypesCategoriesViewSource - { - get - { - return _eventtypescategoriesViewSource; - } - - set - { - _eventtypescategoriesViewSource = value; RaisePropertyChanged(nameof(EventTypesCategoriesViewSource)); - } - - } - - private ObservableCollection _eventtypesgroups; - /// - /// Gets or sets the EventTypesGroups. - /// - public ObservableCollection EventTypesGroups - { - get - { - return _eventtypesgroups; - } - - set - { - _eventtypesgroups = value; RaisePropertyChanged(nameof(EventTypesGroups)); - } - - } - - private ICollectionView _eventtypesgroupsViewSource; - /// - /// Gets or sets the EventTypesGroups View Source. - /// - public ICollectionView EventTypesGroupsViewSource - { - get - { - return _eventtypesgroupsViewSource; - } - - set - { - _eventtypesgroupsViewSource = value; RaisePropertyChanged(nameof(EventTypesGroupsViewSource)); - } - - } - private ObservableCollection _fibershapes; /// /// Gets or sets the FiberShapes. @@ -1421,42 +1277,6 @@ namespace Tango.BL } - private ObservableCollection _htmlpages; - /// - /// Gets or sets the HtmlPages. - /// - public ObservableCollection HtmlPages - { - get - { - return _htmlpages; - } - - set - { - _htmlpages = value; RaisePropertyChanged(nameof(HtmlPages)); - } - - } - - private ICollectionView _htmlpagesViewSource; - /// - /// Gets or sets the HtmlPages View Source. - /// - public ICollectionView HtmlPagesViewSource - { - get - { - return _htmlpagesViewSource; - } - - set - { - _htmlpagesViewSource = value; RaisePropertyChanged(nameof(HtmlPagesViewSource)); - } - - } - private ObservableCollection _idspackformulas; /// /// Gets or sets the IdsPackFormulas. @@ -2797,8 +2617,6 @@ namespace Tango.BL SyncConfigurationsViewSource = CreateCollectionView(SyncConfigurations); - ActionTypesViewSource = CreateCollectionView(ActionTypes); - AddressesViewSource = CreateCollectionView(Addresses); ApplicationDisplayPanelVersionsViewSource = CreateCollectionView(ApplicationDisplayPanelVersions); @@ -2833,12 +2651,6 @@ namespace Tango.BL EventTypesViewSource = CreateCollectionView(EventTypes); - EventTypesActionsViewSource = CreateCollectionView(EventTypesActions); - - EventTypesCategoriesViewSource = CreateCollectionView(EventTypesCategories); - - EventTypesGroupsViewSource = CreateCollectionView(EventTypesGroups); - FiberShapesViewSource = CreateCollectionView(FiberShapes); FiberSynthsViewSource = CreateCollectionView(FiberSynths); @@ -2873,8 +2685,6 @@ namespace Tango.BL HardwareWindersViewSource = CreateCollectionView(HardwareWinders); - HtmlPagesViewSource = CreateCollectionView(HtmlPages); - IdsPackFormulasViewSource = CreateCollectionView(IdsPackFormulas); IdsPacksViewSource = CreateCollectionView(IdsPacks); diff --git a/Software/Visual_Studio/Tango.BL/Serialization/SerializableEntityContractResolver.cs b/Software/Visual_Studio/Tango.BL/Serialization/SerializableEntityContractResolver.cs index 0150a6b5f..d07cf6cf0 100644 --- a/Software/Visual_Studio/Tango.BL/Serialization/SerializableEntityContractResolver.cs +++ b/Software/Visual_Studio/Tango.BL/Serialization/SerializableEntityContractResolver.cs @@ -47,6 +47,13 @@ namespace Tango.BL.Serialization || (include_props.Exists(y => y.DeclaringType.IsAssignableFrom(mi.DeclaringType) && y.ToString() == mi.ToString())); }; + property.ShouldDeserialize = (x) => + { + MemberInfo mi = member; + return (!ignore_props.Exists(y => y.DeclaringType.IsAssignableFrom(mi.DeclaringType) && y.ToString() == mi.ToString())) + || + (include_props.Exists(y => y.DeclaringType.IsAssignableFrom(mi.DeclaringType) && y.ToString() == mi.ToString())); + }; return property; } } diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj index 931f1f94a..dd5122ec2 100644 --- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj +++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj @@ -110,7 +110,6 @@ - @@ -130,11 +129,6 @@ - - - - - @@ -158,8 +152,6 @@ - - @@ -204,13 +196,14 @@ - + + - - + + @@ -245,7 +238,6 @@ - @@ -261,7 +253,6 @@ - @@ -305,7 +296,6 @@ - @@ -414,7 +404,7 @@ - + \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Core/ExtensionMethods/StringExtensions.cs b/Software/Visual_Studio/Tango.Core/ExtensionMethods/StringExtensions.cs index f03bcb647..7a03b8ae4 100644 --- a/Software/Visual_Studio/Tango.Core/ExtensionMethods/StringExtensions.cs +++ b/Software/Visual_Studio/Tango.Core/ExtensionMethods/StringExtensions.cs @@ -233,4 +233,16 @@ public static class StringExtensions { return String.IsNullOrEmpty(str) ? null : str; } + + public static List ToEnumValues(this String str, char splitChar) where T : struct + { + if (!String.IsNullOrWhiteSpace(str)) + { + return str.Split(splitChar).Select(x => (T)Convert.ChangeType(int.Parse(x),typeof(T))).ToList(); + } + else + { + return new List(); + } + } } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/ACTION_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/ACTION_TYPES.cs deleted file mode 100644 index 6a864f024..000000000 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/ACTION_TYPES.cs +++ /dev/null @@ -1,33 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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. -// -//------------------------------------------------------------------------------ - -namespace Tango.DAL.Remote.DB -{ - using System; - using System.Collections.Generic; - - public partial class ACTION_TYPES - { - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] - public ACTION_TYPES() - { - this.EVENT_TYPES_ACTIONS = new HashSet(); - } - - 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 EVENT_TYPES_ACTIONS { get; set; } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER.cs index 769657e6f..d6c015d7a 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER.cs @@ -26,7 +26,11 @@ namespace Tango.DAL.Remote.DB public string SERIAL_NUMBER { get; set; } public string DISPENSER_TYPE_GUID { get; set; } public double NL_PER_PULSE { get; set; } - public byte[] DATA { get; set; } + public string PART_NUMBER { get; set; } + public string PCB_SERIAL { get; set; } + public string PCB_VERSION { get; set; } + public Nullable PRODUCTION_DATE { get; set; } + public byte[] CALIBRATION_DATA { get; set; } public virtual DISPENSER_TYPES DISPENSER_TYPES { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES.cs index 15e848b1e..737f22965 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Remote.DB [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public EVENT_TYPES() { - this.EVENT_TYPES_ACTIONS = new HashSet(); this.MACHINES_EVENTS = new HashSet(); } @@ -26,18 +25,16 @@ namespace Tango.DAL.Remote.DB public System.DateTime LAST_UPDATED { get; set; } public int CODE { get; set; } public string NAME { get; set; } + public string TITLE { get; set; } public string DESCRIPTION { get; set; } - public string EVENT_TYPES_CATEGORY_GUID { get; set; } - public string EVENT_TYPES_GROUP_GUID { get; set; } + public string TECHNICAL_DESCRIPTION { get; set; } + public int COMPONENT_INDEX { get; set; } + public int EVENT_CATEGORY { get; set; } + public int EVENT_GROUP { get; set; } + public int EVENT_NOTIFICATION_TIME { get; set; } + public string EVENT_ACTIONS { get; set; } public bool REQUIRES_USER_INTERVENTION { get; set; } - public string HTML_PAGE_GUID { get; set; } - public bool RESOLVABLE { get; set; } - public virtual EVENT_TYPES_GROUPS EVENT_TYPES_GROUPS { get; set; } - public virtual EVENT_TYPES_CATEGORIES EVENT_TYPES_CATEGORIES { get; set; } - public virtual HTML_PAGES HTML_PAGES { get; set; } - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection EVENT_TYPES_ACTIONS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection MACHINES_EVENTS { get; set; } } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES_ACTIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES_ACTIONS.cs deleted file mode 100644 index 3ce891623..000000000 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES_ACTIONS.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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. -// -//------------------------------------------------------------------------------ - -namespace Tango.DAL.Remote.DB -{ - using System; - using System.Collections.Generic; - - public partial class EVENT_TYPES_ACTIONS - { - public int ID { get; set; } - public string GUID { get; set; } - public System.DateTime LAST_UPDATED { get; set; } - public string EVENT_TYPE_GUID { get; set; } - public string ACTION_TYPE_GUID { get; set; } - - public virtual ACTION_TYPES ACTION_TYPES { get; set; } - public virtual EVENT_TYPES EVENT_TYPES { get; set; } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES_CATEGORIES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES_CATEGORIES.cs deleted file mode 100644 index d8c1c14c9..000000000 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES_CATEGORIES.cs +++ /dev/null @@ -1,33 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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. -// -//------------------------------------------------------------------------------ - -namespace Tango.DAL.Remote.DB -{ - using System; - using System.Collections.Generic; - - public partial class EVENT_TYPES_CATEGORIES - { - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] - public EVENT_TYPES_CATEGORIES() - { - this.EVENT_TYPES = new HashSet(); - } - - 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 EVENT_TYPES { get; set; } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES_GROUPS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES_GROUPS.cs deleted file mode 100644 index 921c0c0df..000000000 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES_GROUPS.cs +++ /dev/null @@ -1,33 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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. -// -//------------------------------------------------------------------------------ - -namespace Tango.DAL.Remote.DB -{ - using System; - using System.Collections.Generic; - - public partial class EVENT_TYPES_GROUPS - { - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] - public EVENT_TYPES_GROUPS() - { - this.EVENT_TYPES = new HashSet(); - } - - 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 EVENT_TYPES { get; set; } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/HTML_PAGES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/HTML_PAGES.cs deleted file mode 100644 index f0b1932c1..000000000 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/HTML_PAGES.cs +++ /dev/null @@ -1,34 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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. -// -//------------------------------------------------------------------------------ - -namespace Tango.DAL.Remote.DB -{ - using System; - using System.Collections.Generic; - - public partial class HTML_PAGES - { - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] - public HTML_PAGES() - { - this.EVENT_TYPES = new HashSet(); - } - - 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; } - public string HTML { get; set; } - - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection EVENT_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 a266b618d..c103a6bba 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs @@ -26,7 +26,6 @@ namespace Tango.DAL.Remote.DB } public virtual DbSet SYNC_CONFIGURATIONS { get; set; } - public virtual DbSet ACTION_TYPES { get; set; } public virtual DbSet
ADDRESSES { get; set; } public virtual DbSet APPLICATION_DISPLAY_PANEL_VERSIONS { get; set; } public virtual DbSet APPLICATION_FIRMWARE_VERSIONS { get; set; } @@ -44,9 +43,6 @@ namespace Tango.DAL.Remote.DB public virtual DbSet DISPENSERS { get; set; } public virtual DbSet EMBEDDED_FIRMWARE_VERSIONS { get; set; } public virtual DbSet EVENT_TYPES { get; set; } - public virtual DbSet EVENT_TYPES_ACTIONS { get; set; } - public virtual DbSet EVENT_TYPES_CATEGORIES { get; set; } - public virtual DbSet EVENT_TYPES_GROUPS { get; set; } public virtual DbSet FIBER_SHAPES { get; set; } public virtual DbSet FIBER_SYNTHS { get; set; } public virtual DbSet HARDWARE_BLOWER_TYPES { get; set; } @@ -64,7 +60,6 @@ namespace Tango.DAL.Remote.DB public virtual DbSet HARDWARE_VERSIONS { get; set; } public virtual DbSet HARDWARE_WINDER_TYPES { get; set; } public virtual DbSet HARDWARE_WINDERS { get; set; } - public virtual DbSet HTML_PAGES { get; set; } public virtual DbSet IDS_PACK_FORMULAS { get; set; } public virtual DbSet IDS_PACKS { get; set; } public virtual DbSet JOB_RUNS { 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 1f5e0b4fe..2ac5ff6b7 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx @@ -5,17 +5,6 @@ - - - - - - - - - - - @@ -237,7 +226,11 @@ - + + + + + @@ -257,45 +250,16 @@ - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -543,18 +507,6 @@ - - - - - - - - - - - - @@ -1306,70 +1258,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2177,7 +2065,6 @@ - @@ -2195,9 +2082,6 @@ - - - @@ -2215,7 +2099,6 @@ - @@ -2318,26 +2201,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -2593,7 +2456,6 @@ - @@ -2611,9 +2473,6 @@ - - - @@ -2631,7 +2490,6 @@ - @@ -2669,10 +2527,6 @@ - - - - @@ -2777,22 +2631,6 @@ - - - - - - - - - - - - - - - - @@ -3010,18 +2848,6 @@ - - - - - - - - - - - - @@ -3274,7 +3100,11 @@ - + + + + + @@ -3297,55 +3127,18 @@ - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3623,19 +3416,6 @@ - - - - - - - - - - - - - @@ -4265,20 +4045,6 @@ - - - - - - - - - - - - - - @@ -4615,56 +4381,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5354,18 +5070,6 @@ - - - - - - - - - - - - @@ -5594,7 +5298,11 @@ - + + + + + @@ -5618,47 +5326,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + @@ -5930,19 +5606,6 @@ - - - - - - - - - - - - - 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 68bdf4f21..7c45c1dda 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram @@ -5,83 +5,77 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -108,10 +102,6 @@ - - - - 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 d958046d0..6938b6eca 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj +++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj @@ -66,9 +66,6 @@ GlobalVersionInfo.cs - - RemoteADO.tt - RemoteADO.tt @@ -120,15 +117,6 @@ RemoteADO.tt - - RemoteADO.tt - - - RemoteADO.tt - - - RemoteADO.tt - RemoteADO.tt @@ -180,9 +168,6 @@ RemoteADO.tt - - RemoteADO.tt - RemoteADO.tt @@ -362,7 +347,7 @@ - + \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.PMR/Diagnostics/EventType.cs b/Software/Visual_Studio/Tango.PMR/Diagnostics/EventType.cs index cafee9719..11f7d7c09 100644 --- a/Software/Visual_Studio/Tango.PMR/Diagnostics/EventType.cs +++ b/Software/Visual_Studio/Tango.PMR/Diagnostics/EventType.cs @@ -22,99 +22,163 @@ namespace Tango.PMR.Diagnostics { static EventTypeReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "Cg9FdmVudFR5cGUucHJvdG8SFVRhbmdvLlBNUi5EaWFnbm9zdGljcyrbHwoJ", - "RXZlbnRUeXBlEggKBE5vbmUQABIPCgtUaHJlYWRCcmVhaxABEh8KG1RocmVh", - "ZFRlbnNpb25Db250cm9sRmFpbHVyZRACEhoKFkZlZWRlckNvbmVJbnN1ZmZp", - "Y2lhbnQQAxIWChJXaW5kZXJHZW5lcmFsRXJyb3IQBBIXChNXaW5kZXJDb25l", - "Tm90RXhpc3RzEAUSHQoZVGhyZWFkRmVlZGluZ0dlbmVyYWxFcnJvchAGEh4K", - "GkR5ZWluZ0hlYWQxT3ZlclRlbXBlcmF0dXJlEAcSHgoaRHllaW5nSGVhZDJP", - "dmVyVGVtcGVyYXR1cmUQCBIeChpEeWVpbmdIZWFkM092ZXJUZW1wZXJhdHVy", - "ZRAJEh4KGkR5ZWluZ0hlYWQ0T3ZlclRlbXBlcmF0dXJlEAoSHgoaRHllaW5n", - "SGVhZDVPdmVyVGVtcGVyYXR1cmUQCxIeChpEeWVpbmdIZWFkNk92ZXJUZW1w", - "ZXJhdHVyZRAMEhsKF0R5ZWluZ0hlYWRUaGVybWFsQ3V0b2ZmEA0SGAoURHJ5", - "ZXJPdmVyVGVtcGVyYXR1cmUQDhIWChJEcnllclRoZXJtYWxDdXRvZmYQDxIm", - "CiJEeWVpbmdIZWFkSGVhdGVyc0N1cnJlbnRPdXRPZlJhbmdlEBASIQodRHJ5", - "ZXJIZWF0ZXJzQ3VycmVudE91dE9mUmFuZ2UQERIXChNEcnllckRIZWFkQ292", - "ZXJPcGVuEBISFAoQQWlyRmlsdGVyQ2xvZ2dlZBATEhkKFUFpckZpbHRlck5v", - "dEluc3RhbGxlZBAUEg4KCldIU0ZhaWx1cmUQFRIeChpXYXN0ZUNvbnRhaW5l", - "cklzQWxtb3N0RnVsbBAWEhgKFFdhc3RlQ29udGFpbmVySXNGdWxsEBcSEwoP", - "RGlzcGVuc2VyMUVtcHR5EBgSEwoPRGlzcGVuc2VyMkVtcHR5EBkSEwoPRGlz", - "cGVuc2VyM0VtcHR5EBoSEwoPRGlzcGVuc2VyNEVtcHR5EBsSEwoPRGlzcGVu", - "c2VyNUVtcHR5EBwSEwoPRGlzcGVuc2VyNkVtcHR5EB0SEwoPRGlzcGVuc2Vy", - "N0VtcHR5EB4SEwoPRGlzcGVuc2VyOEVtcHR5EB8SFgoSRGlzcGVuc2VyMUxv", - "d0xldmVsECASFgoSRGlzcGVuc2VyMkxvd0xldmVsECESFgoSRGlzcGVuc2Vy", - "M0xvd0xldmVsECISFgoSRGlzcGVuc2VyNExvd0xldmVsECMSFgoSRGlzcGVu", - "c2VyNUxvd0xldmVsECQSFgoSRGlzcGVuc2VyNkxvd0xldmVsECUSFgoSRGlz", - "cGVuc2VyN0xvd0xldmVsECYSFgoSRGlzcGVuc2VyOExvd0xldmVsECcSGwoX", - "RGlzcGVuc2VyMVJlZmlsbEZhaWx1cmUQKBIbChdEaXNwZW5zZXIyUmVmaWxs", - "RmFpbHVyZRApEhsKF0Rpc3BlbnNlcjNSZWZpbGxGYWlsdXJlECoSGwoXRGlz", - "cGVuc2VyNFJlZmlsbEZhaWx1cmUQKxIbChdEaXNwZW5zZXI1UmVmaWxsRmFp", - "bHVyZRAsEhsKF0Rpc3BlbnNlcjZSZWZpbGxGYWlsdXJlEC0SGwoXRGlzcGVu", - "c2VyN1JlZmlsbEZhaWx1cmUQLhIbChdEaXNwZW5zZXI4UmVmaWxsRmFpbHVy", - "ZRAvEhYKEkRpc3BlbnNlcjFQcmVzc3VyZRAwEhYKEkRpc3BlbnNlcjJQcmVz", - "c3VyZRAxEhYKEkRpc3BlbnNlcjNQcmVzc3VyZRAyEhYKEkRpc3BlbnNlcjRQ", - "cmVzc3VyZRAzEhYKEkRpc3BlbnNlcjVQcmVzc3VyZRA0EhYKEkRpc3BlbnNl", - "cjZQcmVzc3VyZRA1EhYKEkRpc3BlbnNlcjdQcmVzc3VyZRA2EhYKEkRpc3Bl", - "bnNlcjhQcmVzc3VyZRA3EhEKDU1pZFRhbmsxRW1wdHkQOBIRCg1NaWRUYW5r", - "MkVtcHR5EDkSEQoNTWlkVGFuazNFbXB0eRA6EhEKDU1pZFRhbms0RW1wdHkQ", - "OxIRCg1NaWRUYW5rNUVtcHR5EDwSEQoNTWlkVGFuazZFbXB0eRA9EhEKDU1p", - "ZFRhbms3RW1wdHkQPhIRCg1NaWRUYW5rOEVtcHR5ED8SFAoQTWlkVGFuazFM", - "b3dsZXZlbBBAEhQKEE1pZFRhbmsyTG93bGV2ZWwQQRIUChBNaWRUYW5rM0xv", - "d2xldmVsEEISFAoQTWlkVGFuazRMb3dsZXZlbBBDEhQKEE1pZFRhbms1TG93", - "bGV2ZWwQRBIUChBNaWRUYW5rNkxvd2xldmVsEEUSFAoQTWlkVGFuazdMb3ds", - "ZXZlbBBGEhQKEE1pZFRhbms4TG93bGV2ZWwQRxIWChJNaWRUYW5rMU5vdElu", - "UGxhY2UQSBIWChJNaWRUYW5rMk5vdEluUGxhY2UQSRIWChJNaWRUYW5rM05v", - "dEluUGxhY2UQShIWChJNaWRUYW5rNE5vdEluUGxhY2UQSxIWChJNaWRUYW5r", - "NU5vdEluUGxhY2UQTBIWChJNaWRUYW5rNk5vdEluUGxhY2UQTRIWChJNaWRU", - "YW5rN05vdEluUGxhY2UQThIWChJNaWRUYW5rOE5vdEluUGxhY2UQTxIRCg1T", - "eXN0ZW1CSVRGYWlsEFASIgoeR2VuZXJhbEludGVybmFsT3ZlclRlbXBlcmF0", - "dXJlEFESFAoQTWFjaGluZUNvdmVyT3BlbhBSEh4KGkVtZXJnZW5jeVB1c2hC", - "dXR0b25QcmVzc2VkEFMSFgoSU3lzdGVtR2VuZXJhbEVycm9yEFQSGQoVTW90", - "b3JEcnllck92ZXJDdXJyZW50EF0SGgoWTW90b3JGZWVkZXJPdmVyQ3VycmVu", - "dBBeEhsKF01vdG9yUkxvYWRlck92ZXJDdXJyZW50EF8SGgoWTW90b3JQb29s", - "ZXJPdmVyQ3VycmVudBBgEhsKF01vdG9yTExvYWRlck92ZXJDdXJyZW50EGES", - "GgoWTW90b3JXaW5kZXJPdmVyQ3VycmVudBBiEhkKFU1vdG9yU2NyZXdPdmVy", - "Q3VycmVudBBjEh4KGk1vdG9yTG9hZGluZ0FybU92ZXJDdXJyZW50EGQSHgoa", - "TW90b3JEaXNwZW5zZXIxT3ZlckN1cnJlbnQQZRIeChpNb3RvckRpc3BlbnNl", - "cjJPdmVyQ3VycmVudBBmEh4KGk1vdG9yRGlzcGVuc2VyM092ZXJDdXJyZW50", - "EGcSHgoaTW90b3JEaXNwZW5zZXI0T3ZlckN1cnJlbnQQaBIeChpNb3RvckRp", - "c3BlbnNlcjVPdmVyQ3VycmVudBBpEh4KGk1vdG9yRGlzcGVuc2VyNk92ZXJD", - "dXJyZW50EGoSHgoaTW90b3JEaXNwZW5zZXI3T3ZlckN1cnJlbnQQaxIeChpN", - "b3RvckRpc3BlbnNlcjhPdmVyQ3VycmVudBBsEh0KGU1vdG9yRHJ5ZXJPdmVy", - "VGVtcGVyYXR1cmUQbRIeChpNb3RvckZlZWRlck92ZXJUZW1wZXJhdHVyZRBu", - "Eh8KG01vdG9yUkxvYWRlck92ZXJUZW1wZXJhdHVyZRBvEh4KGk1vdG9yUG9v", - "bGVyT3ZlclRlbXBlcmF0dXJlEHASHwobTW90b3JMTG9hZGVyT3ZlclRlbXBl", - "cmF0dXJlEHESHgoaTW90b3JXaW5kZXJPdmVyVGVtcGVyYXR1cmUQchIdChlN", - "b3RvclNjcmV3T3ZlclRlbXBlcmF0dXJlEHMSIgoeTW90b3JMb2FkaW5nQXJt", - "T3ZlclRlbXBlcmF0dXJlEHQSIgoeTW90b3JEaXNwZW5zZXIxT3ZlclRlbXBl", - "cmF0dXJlEHUSIgoeTW90b3JEaXNwZW5zZXIyT3ZlclRlbXBlcmF0dXJlEHYS", - "IgoeTW90b3JEaXNwZW5zZXIzT3ZlclRlbXBlcmF0dXJlEHcSIgoeTW90b3JE", - "aXNwZW5zZXI0T3ZlclRlbXBlcmF0dXJlEHgSIgoeTW90b3JEaXNwZW5zZXI1", - "T3ZlclRlbXBlcmF0dXJlEHkSIgoeTW90b3JEaXNwZW5zZXI2T3ZlclRlbXBl", - "cmF0dXJlEHoSIgoeTW90b3JEaXNwZW5zZXI3T3ZlclRlbXBlcmF0dXJlEHsS", - "IgoeTW90b3JEaXNwZW5zZXI4T3ZlclRlbXBlcmF0dXJlEHwSEwoPTW90b3JE", - "cnllclN0YWxsEH0SFAoQTW90b3JGZWVkZXJTdGFsbBB+EhUKEU1vdG9yUkxv", - "YWRlclN0YWxsEH8SFQoQTW90b3JQb29sZXJTdGFsbBCAARIWChFNb3RvckxM", - "b2FkZXJTdGFsbBCBARIVChBNb3RvcldpbmRlclN0YWxsEIIBEhQKD01vdG9y", - "U2NyZXdTdGFsbBCDARIZChRNb3RvckxvYWRpbmdBcm1TdGFsbBCEARIZChRN", - "b3RvckRpc3BlbnNlcjFTdGFsbBCFARIZChRNb3RvckRpc3BlbnNlcjJTdGFs", - "bBCGARIZChRNb3RvckRpc3BlbnNlcjNTdGFsbBCHARIZChRNb3RvckRpc3Bl", - "bnNlcjRTdGFsbBCIARIZChRNb3RvckRpc3BlbnNlcjVTdGFsbBCJARIZChRN", - "b3RvckRpc3BlbnNlcjZTdGFsbBCKARIZChRNb3RvckRpc3BlbnNlcjdTdGFs", - "bBCLARIZChRNb3RvckRpc3BlbnNlcjhTdGFsbBCMARIbChZNb3RvckRyeWVy", - "VW5kZXJWb2x0YWdlEI0BEhwKF01vdG9yRmVlZGVyVW5kZXJWb2x0YWdlEI4B", - "Eh0KGE1vdG9yUkxvYWRlclVuZGVyVm9sdGFnZRCPARIcChdNb3RvclBvb2xl", - "clVuZGVyVm9sdGFnZRCQARIdChhNb3RvckxMb2FkZXJVbmRlclZvbHRhZ2UQ", - "kQESHAoXTW90b3JXaW5kZXJVbmRlclZvbHRhZ2UQkgESGwoWTW90b3JTY3Jl", - "d1VuZGVyVm9sdGFnZRCTARIgChtNb3RvckxvYWRpbmdBcm1VbmRlclZvbHRh", - "Z2UQlAESIAobTW90b3JEaXNwZW5zZXIxVW5kZXJWb2x0YWdlEJUBEiAKG01v", - "dG9yRGlzcGVuc2VyMlVuZGVyVm9sdGFnZRCWARIgChtNb3RvckRpc3BlbnNl", - "cjNVbmRlclZvbHRhZ2UQlwESIAobTW90b3JEaXNwZW5zZXI0VW5kZXJWb2x0", - "YWdlEJgBEiAKG01vdG9yRGlzcGVuc2VyNVVuZGVyVm9sdGFnZRCZARIgChtN", - "b3RvckRpc3BlbnNlcjZVbmRlclZvbHRhZ2UQmgESIAobTW90b3JEaXNwZW5z", - "ZXI3VW5kZXJWb2x0YWdlEJsBEiAKG01vdG9yRGlzcGVuc2VyOFVuZGVyVm9s", - "dGFnZRCcAUIhCh9jb20udHdpbmUudGFuZ28ucG1yLmRpYWdub3N0aWNzYgZw", - "cm90bzM=")); + "Cg9FdmVudFR5cGUucHJvdG8SFVRhbmdvLlBNUi5EaWFnbm9zdGljcyq5NgoJ", + "RXZlbnRUeXBlEggKBE5vbmUQABIYChRQT1dFUl9VUF9CSVRfRkFJTFVSRRAB", + "EiEKHUVNRVJHRU5DWV9QVVNIX0JVVFRPTl9QUkVTU0VEEAISFgoSRlJPTlRf", + "Q09WRVJfMV9PUEVOEAMSFgoSRlJPTlRfQ09WRVJfMl9PUEVOEAQSFgoSRlJP", + "TlRfQ09WRVJfM19PUEVOEAUSFgoSRlJPTlRfQ09WRVJfNF9PUEVOEAYSGQoV", + "Q0FSVFJJREdFU19DT1ZFUl9PUEVOEAcSEwoPUkVBUl9DT1ZFUl9PUEVOEAgS", + "JAogTUFDSElORV9JTlRFUk5BTF9PVkVSVEVNUEVSQVRVUkUQCRIcChhNQUNI", + "SU5FX0ZBTlNfUlBNX1RPT19MT1cQChIYChRNQUNISU5FX0ZBTlNfU1RPUFBF", + "RBALEhAKDFRIUkVBRF9CUkVBSxAMEiIKHlRIUkVBRF9URU5TSU9OX0NPTlRS", + "T0xfRkFJTFVSRRANEh4KGldJTkRFUl9DT05FX0RPRVNfTk9UX0VYSVNUEA4S", + "HAoYRkVFREVSX01PVE9SX09WRVJDVVJSRU5UEA8SIgoeUklHSFRfTE9BREVS", + "X01PVE9SX09WRVJDVVJSRU5UEBASHAoYUFVMTEVSX01PVE9SX09WRVJDVVJS", + "RU5UEBESIQodTEVGVF9MT0FERVJfTU9UT1JfT1ZFUkNVUlJFTlQQEhIcChhX", + "SU5ERVJfTU9UT1JfT1ZFUkNVUlJFTlQQExIbChdTQ1JFV19NT1RPUl9PVkVS", + "Q1VSUkVOVBAUEiEKHUxPQURJTkdfQVJNX01PVE9SX09WRVJDVVJSRU5UEBUS", + "IAocRkVFREVSX01PVE9SX09WRVJURU1QRVJBVFVSRRAWEiYKIlJJR0hUX0xP", + "QURFUl9NT1RPUl9PVkVSVEVNUEVSQVRVUkUQFxIgChxQVUxMRVJfTU9UT1Jf", + "T1ZFUlRFTVBFUkFUVVJFEBgSJQohTEVGVF9MT0FERVJfTU9UT1JfT1ZFUlRF", + "TVBFUkFUVVJFEBkSIAocV0lOREVSX01PVE9SX09WRVJURU1QRVJBVFVSRRAa", + "Eh8KG1NDUkVXX01PVE9SX09WRVJURU1QRVJBVFVSRRAbEiUKIUxPQURJTkdf", + "QVJNX01PVE9SX09WRVJURU1QRVJBVFVSRRAcEhYKEkZFRURFUl9NT1RPUl9T", + "VEFMTBAdEhwKGFJJR0hUX0xPQURFUl9NT1RPUl9TVEFMTBAeEhYKElBVTExF", + "Ul9NT1RPUl9TVEFMTBAfEhsKF0xFRlRfTE9BREVSX01PVE9SX1NUQUxMECAS", + "FgoSV0lOREVSX01PVE9SX1NUQUxMECESFQoRU0NSRVdfTU9UT1JfU1RBTEwQ", + "IhIbChdMT0FESU5HX0FSTV9NT1RPUl9TVEFMTBAjEh0KGUZFRURFUl9NT1RP", + "Ul9VTkRFUlZPTFRBR0UQJBIjCh9SSUdIVF9MT0FERVJfTU9UT1JfVU5ERVJW", + "T0xUQUdFECUSHQoZUFVMTEVSX01PVE9SX1VOREVSVk9MVEFHRRAmEiIKHkxF", + "RlRfTE9BREVSX01PVE9SX1VOREVSVk9MVEFHRRAnEh0KGVdJTkRFUl9NT1RP", + "Ul9VTkRFUlZPTFRBR0UQKBIcChhTQ1JFV19NT1RPUl9VTkRFUlZPTFRBR0UQ", + "KRIiCh5MT0FESU5HX0FSTV9NT1RPUl9VTkRFUlZPTFRBR0UQKhITCg9MVEZV", + "X1VQX1RJTUVPVVQQKxIVChFMVEZVX0RPV05fVElNRU9VVBAsEhMKD1JURlVf", + "VVBfVElNRU9VVBAtEhUKEVJURlVfRE9XTl9USU1FT1VUEC4SHQoZU0NSRVdf", + "TU9UT1JfTElNSVRfVElNRU9VVBAvEhsKF0RSWUVSX01PVE9SX09WRVJDVVJS", + "RU5UEDASHwobRFJZRVJfTU9UT1JfT1ZFUlRFTVBFUkFUVVJFEDESFQoRRFJZ", + "RVJfTU9UT1JfU1RBTEwQMhIcChhEUllFUl9NT1RPUl9VTkRFUlZPTFRBR0UQ", + "MxITCg9EUllFUl9ET09SX09QRU4QNBIgChxEUllFUl9aT05FXzFfT1ZFUlRF", + "TVBFUkFUVVJFEDUSIAocRFJZRVJfWk9ORV8yX09WRVJURU1QRVJBVFVSRRA2", + "EiMKH0RSWUVSX1pPTkVfMV9VTkRFUlRFTVBFUkFUVVJFX0EQNxIjCh9EUllF", + "Ul9aT05FXzJfVU5ERVJURU1QRVJBVFVSRV9BEDgSIwofRFJZRVJfWk9ORV8x", + "X1VOREVSVEVNUEVSQVRVUkVfQhA5EiMKH0RSWUVSX1pPTkVfMl9VTkRFUlRF", + "TVBFUkFUVVJFX0IQOhIYChREUllFUl9USEVSTUFMX0NVVE9GRhA7Ei0KKURS", + "WUVSX0hFQVRFUlNfWk9ORV8xX0NVUlJFTlRfT1VUX09GX1JBTkdFEDwSLQop", + "RFJZRVJfSEVBVEVSU19aT05FXzJfQ1VSUkVOVF9PVVRfT0ZfUkFOR0UQPRIr", + "CidEUllFUl9IRUFURVJTX1pPTkVfMV9DVVJSRU5UX0xPT1BfQlJFQUsQPhIr", + "CidEUllFUl9IRUFURVJTX1pPTkVfMl9DVVJSRU5UX0xPT1BfQlJFQUsQPxIZ", + "ChVEUllFUl9GQU5fUlBNX1RPT19MT1cQQBIVChFEUllFUl9GQU5fU1RPUFBF", + "RBBBEiYKIkRZRUlOR19IRUFEX1pPTkVfMV9PVkVSVEVNUEVSQVRVUkUQQhIm", + "CiJEWUVJTkdfSEVBRF9aT05FXzJfT1ZFUlRFTVBFUkFUVVJFEEMSJgoiRFlF", + "SU5HX0hFQURfWk9ORV8zX09WRVJURU1QRVJBVFVSRRBEEiYKIkRZRUlOR19I", + "RUFEX1pPTkVfNF9PVkVSVEVNUEVSQVRVUkUQRRImCiJEWUVJTkdfSEVBRF9a", + "T05FXzVfT1ZFUlRFTVBFUkFUVVJFEEYSJgoiRFlFSU5HX0hFQURfWk9ORV82", + "X09WRVJURU1QRVJBVFVSRRBHEikKJURZRUlOR19IRUFEX1pPTkVfMV9VTkRF", + "UlRFTVBFUkFUVVJFX0EQSBIpCiVEWUVJTkdfSEVBRF9aT05FXzJfVU5ERVJU", + "RU1QRVJBVFVSRV9BEEkSKQolRFlFSU5HX0hFQURfWk9ORV8zX1VOREVSVEVN", + "UEVSQVRVUkVfQRBKEikKJURZRUlOR19IRUFEX1pPTkVfNF9VTkRFUlRFTVBF", + "UkFUVVJFX0EQSxIpCiVEWUVJTkdfSEVBRF9aT05FXzVfVU5ERVJURU1QRVJB", + "VFVSRV9BEEwSKQolRFlFSU5HX0hFQURfWk9ORV82X1VOREVSVEVNUEVSQVRV", + "UkVfQRBNEikKJURZRUlOR19IRUFEX1pPTkVfMV9VTkRFUlRFTVBFUkFUVVJF", + "X0IQThIpCiVEWUVJTkdfSEVBRF9aT05FXzJfVU5ERVJURU1QRVJBVFVSRV9C", + "EE8SKQolRFlFSU5HX0hFQURfWk9ORV8zX1VOREVSVEVNUEVSQVRVUkVfQhBQ", + "EikKJURZRUlOR19IRUFEX1pPTkVfNF9VTkRFUlRFTVBFUkFUVVJFX0IQURIp", + "CiVEWUVJTkdfSEVBRF9aT05FXzVfVU5ERVJURU1QRVJBVFVSRV9CEFISKQol", + "RFlFSU5HX0hFQURfWk9ORV82X1VOREVSVEVNUEVSQVRVUkVfQhBTEisKJ0RZ", + "RUlOR19IRUFEX1pPTkVfMV9DVVJSRU5UX09VVF9PRl9SQU5HRRBUEisKJ0RZ", + "RUlOR19IRUFEX1pPTkVfMl9DVVJSRU5UX09VVF9PRl9SQU5HRRBVEisKJ0RZ", + "RUlOR19IRUFEX1pPTkVfM19DVVJSRU5UX09VVF9PRl9SQU5HRRBWEisKJ0RZ", + "RUlOR19IRUFEX1pPTkVfNF9DVVJSRU5UX09VVF9PRl9SQU5HRRBXEi0KKURZ", + "RUlOR19IRUFEX1pPTkVfNV82X0NVUlJFTlRfT1VUX09GX1JBTkdFEFgSKQol", + "RFlFSU5HX0hFQURfWk9ORV8xX0NVUlJFTlRfTE9PUF9CUkVBSxBZEikKJURZ", + "RUlOR19IRUFEX1pPTkVfMl9DVVJSRU5UX0xPT1BfQlJFQUsQWhIpCiVEWUVJ", + "TkdfSEVBRF9aT05FXzNfQ1VSUkVOVF9MT09QX0JSRUFLEFsSKQolRFlFSU5H", + "X0hFQURfWk9ORV80X0NVUlJFTlRfTE9PUF9CUkVBSxBcEisKJ0RZRUlOR19I", + "RUFEX1pPTkVfNV82X0NVUlJFTlRfTE9PUF9CUkVBSxBdEh4KGkRZRUlOR19I", + "RUFEX1RIRVJNQUxfQ1VUT0ZGEF4SIgoeRFlFSU5HX0hFQURfQ09WRVJfT1BF", + "Tl9USU1FT1VUEF8SIwofRFlFSU5HX0hFQURfQ09WRVJfQ0xPU0VfVElNRU9V", + "VBBgEhkKFU1JWEVSX09WRVJURU1QRVJBVFVSRRBhEhwKGE1JWEVSX1VOREVS", + "VEVNUEVSQVRVUkVfQRBiEhwKGE1JWEVSX1VOREVSVEVNUEVSQVRVUkVfQhBj", + "EhgKFE1JWEVSX1RIRVJNQUxfQ1VUT0ZGEGQSHgoaTUlYRVJfQ1VSUkVOVF9P", + "VVRfT0ZfUkFOR0UQZRIcChhNSVhFUl9DVVJSRU5UX0xPT1BfQlJFQUsQZhIc", + "ChhESVNQRU5TRVJfMV9PVkVSUFJFU1NVUkUQZxIcChhESVNQRU5TRVJfMl9P", + "VkVSUFJFU1NVUkUQaBIcChhESVNQRU5TRVJfM19PVkVSUFJFU1NVUkUQaRIc", + "ChhESVNQRU5TRVJfNF9PVkVSUFJFU1NVUkUQahIcChhESVNQRU5TRVJfNV9P", + "VkVSUFJFU1NVUkUQaxIcChhESVNQRU5TRVJfNl9PVkVSUFJFU1NVUkUQbBIc", + "ChhESVNQRU5TRVJfN19PVkVSUFJFU1NVUkUQbRIcChhESVNQRU5TRVJfOF9P", + "VkVSUFJFU1NVUkUQbhIdChlESVNQRU5TRVJfMV9VTkRFUlBSRVNTVVJFEG8S", + "HQoZRElTUEVOU0VSXzJfVU5ERVJQUkVTU1VSRRBwEh0KGURJU1BFTlNFUl8z", + "X1VOREVSUFJFU1NVUkUQcRIdChlESVNQRU5TRVJfNF9VTkRFUlBSRVNTVVJF", + "EHISHQoZRElTUEVOU0VSXzVfVU5ERVJQUkVTU1VSRRBzEh0KGURJU1BFTlNF", + "Ul82X1VOREVSUFJFU1NVUkUQdBIdChlESVNQRU5TRVJfN19VTkRFUlBSRVNT", + "VVJFEHUSHQoZRElTUEVOU0VSXzhfVU5ERVJQUkVTU1VSRRB2EhUKEURJU1BF", + "TlNFUl8xX0VNUFRZEHcSFQoRRElTUEVOU0VSXzJfRU1QVFkQeBIVChFESVNQ", + "RU5TRVJfM19FTVBUWRB5EhUKEURJU1BFTlNFUl80X0VNUFRZEHoSFQoRRElT", + "UEVOU0VSXzVfRU1QVFkQexIVChFESVNQRU5TRVJfNl9FTVBUWRB8EhUKEURJ", + "U1BFTlNFUl83X0VNUFRZEH0SFQoRRElTUEVOU0VSXzhfRU1QVFkQfhIeChpE", + "SVNQRU5TRVJfMV9SRUZJTExfRkFJTFVSRRB/Eh8KGkRJU1BFTlNFUl8yX1JF", + "RklMTF9GQUlMVVJFEIABEh8KGkRJU1BFTlNFUl8zX1JFRklMTF9GQUlMVVJF", + "EIEBEh8KGkRJU1BFTlNFUl80X1JFRklMTF9GQUlMVVJFEIIBEh8KGkRJU1BF", + "TlNFUl81X1JFRklMTF9GQUlMVVJFEIMBEh8KGkRJU1BFTlNFUl82X1JFRklM", + "TF9GQUlMVVJFEIQBEh8KGkRJU1BFTlNFUl83X1JFRklMTF9GQUlMVVJFEIUB", + "Eh8KGkRJU1BFTlNFUl84X1JFRklMTF9GQUlMVVJFEIYBEiIKHURJU1BFTlNF", + "Ul8xX01PVE9SX09WRVJDVVJSRU5UEIcBEiIKHURJU1BFTlNFUl8yX01PVE9S", + "X09WRVJDVVJSRU5UEIgBEiIKHURJU1BFTlNFUl8zX01PVE9SX09WRVJDVVJS", + "RU5UEIkBEiIKHURJU1BFTlNFUl80X01PVE9SX09WRVJDVVJSRU5UEIoBEiIK", + "HURJU1BFTlNFUl81X01PVE9SX09WRVJDVVJSRU5UEIsBEiIKHURJU1BFTlNF", + "Ul82X01PVE9SX09WRVJDVVJSRU5UEIwBEiIKHURJU1BFTlNFUl83X01PVE9S", + "X09WRVJDVVJSRU5UEI0BEiIKHURJU1BFTlNFUl84X01PVE9SX09WRVJDVVJS", + "RU5UEI4BEiYKIURJU1BFTlNFUl8xX01PVE9SX09WRVJURU1QRVJBVFVSRRCP", + "ARImCiFESVNQRU5TRVJfMl9NT1RPUl9PVkVSVEVNUEVSQVRVUkUQkAESJgoh", + "RElTUEVOU0VSXzNfTU9UT1JfT1ZFUlRFTVBFUkFUVVJFEJEBEiYKIURJU1BF", + "TlNFUl80X01PVE9SX09WRVJURU1QRVJBVFVSRRCSARImCiFESVNQRU5TRVJf", + "NV9NT1RPUl9PVkVSVEVNUEVSQVRVUkUQkwESJgohRElTUEVOU0VSXzZfTU9U", + "T1JfT1ZFUlRFTVBFUkFUVVJFEJQBEiYKIURJU1BFTlNFUl83X01PVE9SX09W", + "RVJURU1QRVJBVFVSRRCVARImCiFESVNQRU5TRVJfOF9NT1RPUl9PVkVSVEVN", + "UEVSQVRVUkUQlgESHAoXRElTUEVOU0VSXzFfTU9UT1JfU1RBTEwQlwESHAoX", + "RElTUEVOU0VSXzJfTU9UT1JfU1RBTEwQmAESHAoXRElTUEVOU0VSXzNfTU9U", + "T1JfU1RBTEwQmQESHAoXRElTUEVOU0VSXzRfTU9UT1JfU1RBTEwQmgESHAoX", + "RElTUEVOU0VSXzVfTU9UT1JfU1RBTEwQmwESHAoXRElTUEVOU0VSXzZfTU9U", + "T1JfU1RBTEwQnAESHAoXRElTUEVOU0VSXzdfTU9UT1JfU1RBTEwQnQESHAoX", + "RElTUEVOU0VSXzhfTU9UT1JfU1RBTEwQngESIwoeRElTUEVOU0VSXzFfTU9U", + "T1JfVU5ERVJWT0xUQUdFEJ8BEiMKHkRJU1BFTlNFUl8yX01PVE9SX1VOREVS", + "Vk9MVEFHRRCgARIjCh5ESVNQRU5TRVJfM19NT1RPUl9VTkRFUlZPTFRBR0UQ", + "oQESIwoeRElTUEVOU0VSXzRfTU9UT1JfVU5ERVJWT0xUQUdFEKIBEiMKHkRJ", + "U1BFTlNFUl81X01PVE9SX1VOREVSVk9MVEFHRRCjARIjCh5ESVNQRU5TRVJf", + "Nl9NT1RPUl9VTkRFUlZPTFRBR0UQpAESIwoeRElTUEVOU0VSXzdfTU9UT1Jf", + "VU5ERVJWT0xUQUdFEKUBEiMKHkRJU1BFTlNFUl84X01PVE9SX1VOREVSVk9M", + "VEFHRRCmARIZChRNSURfVEFOS18xX0xPV19MRVZFTBCnARIZChRNSURfVEFO", + "S18yX0xPV19MRVZFTBCoARIZChRNSURfVEFOS18zX0xPV19MRVZFTBCpARIZ", + "ChRNSURfVEFOS180X0xPV19MRVZFTBCqARIZChRNSURfVEFOS181X0xPV19M", + "RVZFTBCrARIZChRNSURfVEFOS182X0xPV19MRVZFTBCsARIZChRNSURfVEFO", + "S183X0xPV19MRVZFTBCtARIZChRNSURfVEFOS184X0xPV19MRVZFTBCuARIV", + "ChBNSURfVEFOS18xX0VNUFRZEK8BEhUKEE1JRF9UQU5LXzJfRU1QVFkQsAES", + "FQoQTUlEX1RBTktfM19FTVBUWRCxARIVChBNSURfVEFOS180X0VNUFRZELIB", + "EhUKEE1JRF9UQU5LXzVfRU1QVFkQswESFQoQTUlEX1RBTktfNl9FTVBUWRC0", + "ARIVChBNSURfVEFOS183X0VNUFRZELUBEhUKEE1JRF9UQU5LXzhfRU1QVFkQ", + "tgESGAoTTUlEX1RBTktfMV9PVkVSRkxPVxC3ARIYChNNSURfVEFOS18yX09W", + "RVJGTE9XELgBEhgKE01JRF9UQU5LXzNfT1ZFUkZMT1cQuQESGAoTTUlEX1RB", + "TktfNF9PVkVSRkxPVxC6ARIYChNNSURfVEFOS181X09WRVJGTE9XELsBEhgK", + "E01JRF9UQU5LXzZfT1ZFUkZMT1cQvAESGAoTTUlEX1RBTktfN19PVkVSRkxP", + "VxC9ARIYChNNSURfVEFOS184X09WRVJGTE9XEL4BEh0KGEFJUl9GSUxURVJf", + "Tk9UX0lOU1RBTExFRBC/ARIXChJBSVJfRklMVEVSX0NMT0dHRUQQwAESJQog", + "V0FTVEVfQ09OVEFJTkVSX0VNUFRZSU5HX1RJTUVPVVQQwQESFAoPTk9fQUlS", + "X1BSRVNTVVJFEMIBEh0KGFdBU1RFX0NPTlRBSU5FUl9PVkVSRkxPVxDDARIV", + "ChBWT0NfU0VOU09SX0FMQVJNEMQBEhgKE0NISUxMRVJfRFJZX0NPTlRBQ1QQ", + "xQESGgoVSU5TVUZGSUNJRU5UX0FJUl9GTE9XEMYBEioKJUlOS19DQVJUUklE", + "R0VfUFJFU0VOQ0VfU0VOU09SX1RJTUVPVVQQxwESHwoaSU5LX0NBUlRSSURH", + "RV9SRklEX1RJTUVPVVQQyAESIQocTk9fV0FTVEVfQ0FSVFJJREdFX0FWQUlM", + "QUJMRRDJARIeChlBTExfV0FTVEVfQ0FSVFJJREdFU19GVUxMEMoBEiwKJ1dB", + "U1RFX0NBUlRSSURHRV9QUkVTRU5DRV9TRU5TT1JfVElNRU9VVBDLARIhChxX", + "QVNURV9DQVJUUklER0VfUkZJRF9USU1FT1VUEMwBEigKI0VMRUNUUklDQUxf", + "Q0FCSU5FVF9GQU5TX1JQTV9UT09fTE9XEM0BEiQKH0VMRUNUUklDQUxfQ0FC", + "SU5FVF9GQU5TX1NUT1BQRUQQzgESEQoMUkVRVUVTVF9TRU5UEOgHEhYKEVJF", + "U1BPTlNFX1JFQ0VJVkVEEOkHEhMKDlJFUVVFU1RfRkFJTEVEEOoHEhoKFUFQ", + "UExJQ0FUSU9OX0VYQ0VQVElPThDrBxIcChdBUFBMSUNBVElPTl9JTkZPUk1B", + "VElPThDsBxIYChNBUFBMSUNBVElPTl9TVEFSVEVEEO0HEhsKFkFQUExJQ0FU", + "SU9OX1RFUk1JTkFURUQQ7gcSFgoRUkVDT1JESU5HX1NUQVJURUQQ7wcSFgoR", + "UkVDT1JESU5HX1NUT1BQRUQQ8AcSDwoKSk9CX1NUQVRVUxDxB0IhCh9jb20u", + "dHdpbmUudGFuZ28ucG1yLmRpYWdub3N0aWNzYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Diagnostics.EventType), }, null)); @@ -125,601 +189,873 @@ namespace Tango.PMR.Diagnostics { #region Enums public enum EventType { /// - ///None (Group = Application, Category = Info, Actions = ) + ///Must contain a 0 value /// [pbr::OriginalName("None")] None = 0, /// - /// Thread Break (Group = Thread Feeding System, Category = Error, Actions = ) + ///Could not complete power-up BIT. (Group = GeneralHardware, Category = Error) /// - [pbr::OriginalName("ThreadBreak")] ThreadBreak = 1, + [pbr::OriginalName("POWER_UP_BIT_FAILURE")] PowerUpBitFailure = 1, /// - /// Thread Tension Control Failure (Group = Thread Feeding System, Category = Error, Actions = ) + ///Emergency button pressed (Group = GeneralHardware, Category = Safety) /// - [pbr::OriginalName("ThreadTensionControlFailure")] ThreadTensionControlFailure = 2, + [pbr::OriginalName("EMERGENCY_PUSH_BUTTON_PRESSED")] EmergencyPushButtonPressed = 2, /// - /// Feeder Cone Insufficiant (Group = Thread Feeding System, Category = Warning, Actions = ) + ///Front cover 1 open (Group = GeneralHardware, Category = Error) /// - [pbr::OriginalName("FeederConeInsufficiant")] FeederConeInsufficiant = 3, + [pbr::OriginalName("FRONT_COVER_1_OPEN")] FrontCover1Open = 3, /// - /// Winder General Error (Group = Thread Feeding System, Category = Error, Actions = ) + ///Front cover 2 open (Group = GeneralHardware, Category = Error) /// - [pbr::OriginalName("WinderGeneralError")] WinderGeneralError = 4, + [pbr::OriginalName("FRONT_COVER_2_OPEN")] FrontCover2Open = 4, /// - /// Winder Cone Not Exists (Group = Thread Feeding System, Category = Warning, Actions = ) + ///Front cover 3 open (Group = GeneralHardware, Category = Error) /// - [pbr::OriginalName("WinderConeNotExists")] WinderConeNotExists = 5, + [pbr::OriginalName("FRONT_COVER_3_OPEN")] FrontCover3Open = 5, /// - /// Thread Feeding General Error (Group = Thread Feeding System, Category = Error, Actions = ) + ///Front cover 4 open (Group = GeneralHardware, Category = Error) /// - [pbr::OriginalName("ThreadFeedingGeneralError")] ThreadFeedingGeneralError = 6, + [pbr::OriginalName("FRONT_COVER_4_OPEN")] FrontCover4Open = 6, /// - /// Dyeing Head 1 Over Temperature (Group = Dryer Head, Category = Critical, Actions = ) + ///Cartridges cover open (Group = GeneralHardware, Category = Warning) /// - [pbr::OriginalName("DyeingHead1OverTemperature")] DyeingHead1OverTemperature = 7, + [pbr::OriginalName("CARTRIDGES_COVER_OPEN")] CartridgesCoverOpen = 7, /// - /// Dyeing Head 2 Over Temperature (Group = Dryer Head, Category = Critical, Actions = ) + ///Rear cover open (Group = GeneralHardware, Category = Error) /// - [pbr::OriginalName("DyeingHead2OverTemperature")] DyeingHead2OverTemperature = 8, + [pbr::OriginalName("REAR_COVER_OPEN")] RearCoverOpen = 8, /// - /// Dyeing Head 3 Over Temperature (Group = Dryer Head, Category = Critical, Actions = ) + ///Overtemperature in machine intern (Group = GeneralHardware, Category = Error) /// - [pbr::OriginalName("DyeingHead3OverTemperature")] DyeingHead3OverTemperature = 9, + [pbr::OriginalName("MACHINE_INTERNAL_OVERTEMPERATURE")] MachineInternalOvertemperature = 9, /// - /// Dyeing Head 4 Over Temperature (Group = Dryer Head, Category = Critical, Actions = ) + ///Internal fans RPM too low (Group = GeneralHardware, Category = Warning) /// - [pbr::OriginalName("DyeingHead4OverTemperature")] DyeingHead4OverTemperature = 10, + [pbr::OriginalName("MACHINE_FANS_RPM_TOO_LOW")] MachineFansRpmTooLow = 10, /// - /// Dyeing Head 5 Over Temperature (Group = Dryer Head, Category = Critical, Actions = ) + ///Internal fans stopped (Group = GeneralHardware, Category = Error) /// - [pbr::OriginalName("DyeingHead5OverTemperature")] DyeingHead5OverTemperature = 11, + [pbr::OriginalName("MACHINE_FANS_STOPPED")] MachineFansStopped = 11, /// - /// Dyeing Head 6 Over Temperature (Group = Dryer Head, Category = Critical, Actions = ) + ///Thread break (Group = ThreadFeedingSystem, Category = Error) /// - [pbr::OriginalName("DyeingHead6OverTemperature")] DyeingHead6OverTemperature = 12, + [pbr::OriginalName("THREAD_BREAK")] ThreadBreak = 12, /// - /// Dyeing Head Thermal Cutoff (Group = Dryer Head, Category = Critical, Actions = ) + ///Thread tension control faiure (Group = ThreadFeedingSystem, Category = Error) /// - [pbr::OriginalName("DyeingHeadThermalCutoff")] DyeingHeadThermalCutoff = 13, + [pbr::OriginalName("THREAD_TENSION_CONTROL_FAILURE")] ThreadTensionControlFailure = 13, /// - /// Dryer Over Temperature (Group = Dryer, Category = Critical, Actions = ) + ///No cone in winder (Group = ThreadFeedingSystem, Category = Error) /// - [pbr::OriginalName("DryerOverTemperature")] DryerOverTemperature = 14, + [pbr::OriginalName("WINDER_CONE_DOES_NOT_EXIST")] WinderConeDoesNotExist = 14, /// - /// Dryer Thermal Cutoff (Group = Dryer, Category = Critical, Actions = ) + ///Overcurrent in feeder motor (Group = ThreadFeedingSystem, Category = Error) /// - [pbr::OriginalName("DryerThermalCutoff")] DryerThermalCutoff = 15, + [pbr::OriginalName("FEEDER_MOTOR_OVERCURRENT")] FeederMotorOvercurrent = 15, /// - /// Dyeing Head Heaters Current Out Of Range (Group = Dryer Head, Category = Error, Actions = ) + ///Overcurrent in right loader motor (Group = ThreadFeedingSystem, Category = Error) /// - [pbr::OriginalName("DyeingHeadHeatersCurrentOutOfRange")] DyeingHeadHeatersCurrentOutOfRange = 16, + [pbr::OriginalName("RIGHT_LOADER_MOTOR_OVERCURRENT")] RightLoaderMotorOvercurrent = 16, /// - /// Dryer Heaters Current Out Of Range (Group = Dryer, Category = Error, Actions = ) + ///Overcurrent in puller motor (Group = ThreadFeedingSystem, Category = Error) /// - [pbr::OriginalName("DryerHeatersCurrentOutOfRange")] DryerHeatersCurrentOutOfRange = 17, + [pbr::OriginalName("PULLER_MOTOR_OVERCURRENT")] PullerMotorOvercurrent = 17, /// - /// Dryer Dying Head Cover Open (Group = Dryer, Category = Error, Actions = ) + ///Overcurrent in left loader motor (Group = ThreadFeedingSystem, Category = Error) /// - [pbr::OriginalName("DryerDHeadCoverOpen")] DryerDheadCoverOpen = 18, + [pbr::OriginalName("LEFT_LOADER_MOTOR_OVERCURRENT")] LeftLoaderMotorOvercurrent = 18, /// - /// Air Filter Clogged (Group = Waste Handling System, Category = Error, Actions = ) + ///Overcurrent in winder motor (Group = ThreadFeedingSystem, Category = Error) /// - [pbr::OriginalName("AirFilterClogged")] AirFilterClogged = 19, + [pbr::OriginalName("WINDER_MOTOR_OVERCURRENT")] WinderMotorOvercurrent = 19, /// - /// Air Filter Not Installed (Group = Waste Handling System, Category = Error, Actions = ) + ///Overcurrent in screw motor (Group = ThreadFeedingSystem, Category = Error) /// - [pbr::OriginalName("AirFilterNotInstalled")] AirFilterNotInstalled = 20, + [pbr::OriginalName("SCREW_MOTOR_OVERCURRENT")] ScrewMotorOvercurrent = 20, /// - /// WHS Failure (Group = Waste Handling System, Category = Error, Actions = ) + ///Overcurrent in loading arm motor (Group = ThreadFeedingSystem, Category = Error) /// - [pbr::OriginalName("WHSFailure")] Whsfailure = 21, + [pbr::OriginalName("LOADING_ARM_MOTOR_OVERCURRENT")] LoadingArmMotorOvercurrent = 21, /// - /// Waste Container Is Almost Full (Group = Waste Handling System, Category = Warning, Actions = ) + ///Overtemperature in feeder motor (Group = ThreadFeedingSystem, Category = Error) /// - [pbr::OriginalName("WasteContainerIsAlmostFull")] WasteContainerIsAlmostFull = 22, + [pbr::OriginalName("FEEDER_MOTOR_OVERTEMPERATURE")] FeederMotorOvertemperature = 22, /// - /// Waste Container Is Full (Group = Waste Handling System, Category = Error, Actions = ) + ///Overtemperature in right loader motor (Group = ThreadFeedingSystem, Category = Error) /// - [pbr::OriginalName("WasteContainerIsFull")] WasteContainerIsFull = 23, + [pbr::OriginalName("RIGHT_LOADER_MOTOR_OVERTEMPERATURE")] RightLoaderMotorOvertemperature = 23, /// - /// Dispenser 1 Empty (Group = Ink Delivery System, Category = Error, Actions = ) + ///Overtemperature in puller motor (Group = ThreadFeedingSystem, Category = Error) /// - [pbr::OriginalName("Dispenser1Empty")] Dispenser1Empty = 24, + [pbr::OriginalName("PULLER_MOTOR_OVERTEMPERATURE")] PullerMotorOvertemperature = 24, /// - /// Dispenser 2 Empty (Group = Ink Delivery System, Category = Error, Actions = ) + ///Overtemperature in left loader motor (Group = ThreadFeedingSystem, Category = Error) /// - [pbr::OriginalName("Dispenser2Empty")] Dispenser2Empty = 25, + [pbr::OriginalName("LEFT_LOADER_MOTOR_OVERTEMPERATURE")] LeftLoaderMotorOvertemperature = 25, /// - /// Dispenser 3 Empty (Group = Ink Delivery System, Category = Error, Actions = ) + ///Overtemperature in winder motor (Group = ThreadFeedingSystem, Category = Error) /// - [pbr::OriginalName("Dispenser3Empty")] Dispenser3Empty = 26, + [pbr::OriginalName("WINDER_MOTOR_OVERTEMPERATURE")] WinderMotorOvertemperature = 26, /// - /// Dispenser 4 Empty (Group = Ink Delivery System, Category = Error, Actions = ) + ///Overtemperature in screw motor (Group = ThreadFeedingSystem, Category = Error) /// - [pbr::OriginalName("Dispenser4Empty")] Dispenser4Empty = 27, + [pbr::OriginalName("SCREW_MOTOR_OVERTEMPERATURE")] ScrewMotorOvertemperature = 27, /// - /// Dispenser 5 Empty (Group = Ink Delivery System, Category = Error, Actions = ) + ///Overtemperature in loading arm motor (Group = ThreadFeedingSystem, Category = Error) /// - [pbr::OriginalName("Dispenser5Empty")] Dispenser5Empty = 28, + [pbr::OriginalName("LOADING_ARM_MOTOR_OVERTEMPERATURE")] LoadingArmMotorOvertemperature = 28, /// - /// Dispenser 6 Empty (Group = Ink Delivery System, Category = Error, Actions = ) + ///Feeder motor stalled (Group = ThreadFeedingSystem, Category = Error) /// - [pbr::OriginalName("Dispenser6Empty")] Dispenser6Empty = 29, + [pbr::OriginalName("FEEDER_MOTOR_STALL")] FeederMotorStall = 29, /// - /// Dispenser 7 Empty (Group = Ink Delivery System, Category = Error, Actions = ) + ///Right loader motor stalled (Group = ThreadFeedingSystem, Category = Error) /// - [pbr::OriginalName("Dispenser7Empty")] Dispenser7Empty = 30, + [pbr::OriginalName("RIGHT_LOADER_MOTOR_STALL")] RightLoaderMotorStall = 30, /// - /// Dispenser 8 Empty (Group = Ink Delivery System, Category = Error, Actions = ) + ///Puller motor stalled (Group = ThreadFeedingSystem, Category = Error) /// - [pbr::OriginalName("Dispenser8Empty")] Dispenser8Empty = 31, + [pbr::OriginalName("PULLER_MOTOR_STALL")] PullerMotorStall = 31, /// - /// Dispenser 1 Low Level (Group = Ink Delivery System, Category = Error, Actions = ) + ///Left loader motor stalled (Group = ThreadFeedingSystem, Category = Error) /// - [pbr::OriginalName("Dispenser1LowLevel")] Dispenser1LowLevel = 32, + [pbr::OriginalName("LEFT_LOADER_MOTOR_STALL")] LeftLoaderMotorStall = 32, /// - /// Dispenser 2 Low Level (Group = Ink Delivery System, Category = Error, Actions = ) + ///Winder motor stalled (Group = ThreadFeedingSystem, Category = Error) /// - [pbr::OriginalName("Dispenser2LowLevel")] Dispenser2LowLevel = 33, + [pbr::OriginalName("WINDER_MOTOR_STALL")] WinderMotorStall = 33, /// - /// Dispenser 3 Low Level (Group = Ink Delivery System, Category = Error, Actions = ) + ///Screw motor stalled (Group = ThreadFeedingSystem, Category = Error) /// - [pbr::OriginalName("Dispenser3LowLevel")] Dispenser3LowLevel = 34, + [pbr::OriginalName("SCREW_MOTOR_STALL")] ScrewMotorStall = 34, /// - /// Dispenser 4 Low Level (Group = Ink Delivery System, Category = Error, Actions = ) + ///Loading arm motor stalled (Group = ThreadFeedingSystem, Category = Error) /// - [pbr::OriginalName("Dispenser4LowLevel")] Dispenser4LowLevel = 35, + [pbr::OriginalName("LOADING_ARM_MOTOR_STALL")] LoadingArmMotorStall = 35, /// - /// Dispenser 5 Low Level (Group = Ink Delivery System, Category = Error, Actions = ) + ///Undervoltage in feeder motor (Group = ThreadFeedingSystem, Category = Error) /// - [pbr::OriginalName("Dispenser5LowLevel")] Dispenser5LowLevel = 36, + [pbr::OriginalName("FEEDER_MOTOR_UNDERVOLTAGE")] FeederMotorUndervoltage = 36, /// - /// Dispenser 6 Low Level (Group = Ink Delivery System, Category = Error, Actions = ) + ///Undervoltage in right loader motor (Group = ThreadFeedingSystem, Category = Error) /// - [pbr::OriginalName("Dispenser6LowLevel")] Dispenser6LowLevel = 37, + [pbr::OriginalName("RIGHT_LOADER_MOTOR_UNDERVOLTAGE")] RightLoaderMotorUndervoltage = 37, /// - /// Dispenser 7 Low Level (Group = Ink Delivery System, Category = Error, Actions = ) + ///Undervoltage in puller motor (Group = ThreadFeedingSystem, Category = Error) /// - [pbr::OriginalName("Dispenser7LowLevel")] Dispenser7LowLevel = 38, + [pbr::OriginalName("PULLER_MOTOR_UNDERVOLTAGE")] PullerMotorUndervoltage = 38, /// - /// Dispenser 8 Low Level (Group = Ink Delivery System, Category = Error, Actions = ) + ///Undervoltage in left loader motor (Group = ThreadFeedingSystem, Category = Error) /// - [pbr::OriginalName("Dispenser8LowLevel")] Dispenser8LowLevel = 39, + [pbr::OriginalName("LEFT_LOADER_MOTOR_UNDERVOLTAGE")] LeftLoaderMotorUndervoltage = 39, /// - /// Dispenser 1 Refill Failure (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Undervoltage in winder motor (Group = ThreadFeedingSystem, Category = Error) /// - [pbr::OriginalName("Dispenser1RefillFailure")] Dispenser1RefillFailure = 40, + [pbr::OriginalName("WINDER_MOTOR_UNDERVOLTAGE")] WinderMotorUndervoltage = 40, /// - /// Dispenser 2 Refill Failure (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Undervoltage in screw motor (Group = ThreadFeedingSystem, Category = Error) /// - [pbr::OriginalName("Dispenser2RefillFailure")] Dispenser2RefillFailure = 41, + [pbr::OriginalName("SCREW_MOTOR_UNDERVOLTAGE")] ScrewMotorUndervoltage = 41, /// - /// Dispenser 3 Refill Failure (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Undervoltage in loading arm motor (Group = ThreadFeedingSystem, Category = Error) /// - [pbr::OriginalName("Dispenser3RefillFailure")] Dispenser3RefillFailure = 42, + [pbr::OriginalName("LOADING_ARM_MOTOR_UNDERVOLTAGE")] LoadingArmMotorUndervoltage = 42, /// - /// Dispenser 4 Refill Failure (Group = Ink Delivery System, Category = Warning, Actions = ) + ///LTFU up failure (Group = ThreadFeedingSystem, Category = Error) /// - [pbr::OriginalName("Dispenser4RefillFailure")] Dispenser4RefillFailure = 43, + [pbr::OriginalName("LTFU_UP_TIMEOUT")] LtfuUpTimeout = 43, /// - /// Dispenser 5 Refill Failure (Group = Ink Delivery System, Category = Warning, Actions = ) + ///LTFU down failure (Group = ThreadFeedingSystem, Category = Error) /// - [pbr::OriginalName("Dispenser5RefillFailure")] Dispenser5RefillFailure = 44, + [pbr::OriginalName("LTFU_DOWN_TIMEOUT")] LtfuDownTimeout = 44, /// - /// Dispenser 6 Refill Failure (Group = Ink Delivery System, Category = Warning, Actions = ) + ///RTFU up failure (Group = ThreadFeedingSystem, Category = Error) /// - [pbr::OriginalName("Dispenser6RefillFailure")] Dispenser6RefillFailure = 45, + [pbr::OriginalName("RTFU_UP_TIMEOUT")] RtfuUpTimeout = 45, /// - /// Dispenser 7 Refill Failure (Group = Ink Delivery System, Category = Warning, Actions = ) + ///RTFU down failure (Group = ThreadFeedingSystem, Category = Error) /// - [pbr::OriginalName("Dispenser7RefillFailure")] Dispenser7RefillFailure = 46, + [pbr::OriginalName("RTFU_DOWN_TIMEOUT")] RtfuDownTimeout = 46, /// - /// Dispenser 8 Refill Failure (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Screw travel failure (Group = ThreadFeedingSystem, Category = Error) /// - [pbr::OriginalName("Dispenser8RefillFailure")] Dispenser8RefillFailure = 47, + [pbr::OriginalName("SCREW_MOTOR_LIMIT_TIMEOUT")] ScrewMotorLimitTimeout = 47, /// - /// Dispenser 1 Pressure (Group = Ink Delivery System, Category = Critical, Actions = ) + ///Overcurrent in dryer motor (Group = Dryer, Category = Error) /// - [pbr::OriginalName("Dispenser1Pressure")] Dispenser1Pressure = 48, + [pbr::OriginalName("DRYER_MOTOR_OVERCURRENT")] DryerMotorOvercurrent = 48, /// - /// Dispenser 2 Pressure (Group = Ink Delivery System, Category = Critical, Actions = ) + ///Overtemperature in dryer motor (Group = Dryer, Category = Error) /// - [pbr::OriginalName("Dispenser2Pressure")] Dispenser2Pressure = 49, + [pbr::OriginalName("DRYER_MOTOR_OVERTEMPERATURE")] DryerMotorOvertemperature = 49, /// - /// Dispenser 3 Pressure (Group = Ink Delivery System, Category = Critical, Actions = ) + ///Dryer motor stalled (Group = Dryer, Category = Error) /// - [pbr::OriginalName("Dispenser3Pressure")] Dispenser3Pressure = 50, + [pbr::OriginalName("DRYER_MOTOR_STALL")] DryerMotorStall = 50, /// - /// Dispenser 4 Pressure (Group = Ink Delivery System, Category = Critical, Actions = ) + ///Undervoltage in dryer motor (Group = Dryer, Category = Error) /// - [pbr::OriginalName("Dispenser4Pressure")] Dispenser4Pressure = 51, + [pbr::OriginalName("DRYER_MOTOR_UNDERVOLTAGE")] DryerMotorUndervoltage = 51, /// - /// Dispenser 5 Pressure (Group = Ink Delivery System, Category = Critical, Actions = ) + ///Dryer door open (Group = Dryer, Category = Safety) /// - [pbr::OriginalName("Dispenser5Pressure")] Dispenser5Pressure = 52, + [pbr::OriginalName("DRYER_DOOR_OPEN")] DryerDoorOpen = 52, /// - /// Dispenser 6 Pressure (Group = Ink Delivery System, Category = Critical, Actions = ) + ///Overtemperature in dryer zone 1 (Group = Dryer, Category = Error) /// - [pbr::OriginalName("Dispenser6Pressure")] Dispenser6Pressure = 53, + [pbr::OriginalName("DRYER_ZONE_1_OVERTEMPERATURE")] DryerZone1Overtemperature = 53, /// - /// Dispenser 7 Pressure (Group = Ink Delivery System, Category = Critical, Actions = ) + ///Overtemperature in dryer zone 2 (Group = Dryer, Category = Error) /// - [pbr::OriginalName("Dispenser7Pressure")] Dispenser7Pressure = 54, + [pbr::OriginalName("DRYER_ZONE_2_OVERTEMPERATURE")] DryerZone2Overtemperature = 54, /// - /// Dispenser 8 Pressure (Group = Ink Delivery System, Category = Critical, Actions = ) + ///Undertemperature in dryer zone 1 (Group = Dryer, Category = Error) /// - [pbr::OriginalName("Dispenser8Pressure")] Dispenser8Pressure = 55, + [pbr::OriginalName("DRYER_ZONE_1_UNDERTEMPERATURE_A")] DryerZone1UndertemperatureA = 55, /// - /// Mid Tank 1 Empty (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Undertemperature in dryer zone 2 (Group = Dryer, Category = Error) /// - [pbr::OriginalName("MidTank1Empty")] MidTank1Empty = 56, + [pbr::OriginalName("DRYER_ZONE_2_UNDERTEMPERATURE_A")] DryerZone2UndertemperatureA = 56, /// - /// Mid Tank 2 Empty (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Undertemperature in dryer zone 1 (Group = Dryer, Category = Error) /// - [pbr::OriginalName("MidTank2Empty")] MidTank2Empty = 57, + [pbr::OriginalName("DRYER_ZONE_1_UNDERTEMPERATURE_B")] DryerZone1UndertemperatureB = 57, /// - /// Mid Tank 3 Empty (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Undertemperature in dryer zone 2 (Group = Dryer, Category = Error) /// - [pbr::OriginalName("MidTank3Empty")] MidTank3Empty = 58, + [pbr::OriginalName("DRYER_ZONE_2_UNDERTEMPERATURE_B")] DryerZone2UndertemperatureB = 58, /// - /// Mid Tank 4 Empty (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Overheating in dryer (Group = Dryer, Category = Safety) /// - [pbr::OriginalName("MidTank4Empty")] MidTank4Empty = 59, + [pbr::OriginalName("DRYER_THERMAL_CUTOFF")] DryerThermalCutoff = 59, /// - /// Mid Tank 5 Empty (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Dryer zone 1 current out of range (Group = Dryer, Category = Error) /// - [pbr::OriginalName("MidTank5Empty")] MidTank5Empty = 60, + [pbr::OriginalName("DRYER_HEATERS_ZONE_1_CURRENT_OUT_OF_RANGE")] DryerHeatersZone1CurrentOutOfRange = 60, /// - /// Mid Tank 6 Empty (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Dryer zone 2 current out of range (Group = Dryer, Category = Error) /// - [pbr::OriginalName("MidTank6Empty")] MidTank6Empty = 61, + [pbr::OriginalName("DRYER_HEATERS_ZONE_2_CURRENT_OUT_OF_RANGE")] DryerHeatersZone2CurrentOutOfRange = 61, /// - /// Mid Tank 7 Empty (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Dryer zone 1 current loop break (Group = Dryer, Category = Error) /// - [pbr::OriginalName("MidTank7Empty")] MidTank7Empty = 62, + [pbr::OriginalName("DRYER_HEATERS_ZONE_1_CURRENT_LOOP_BREAK")] DryerHeatersZone1CurrentLoopBreak = 62, /// - /// Mid Tank 8 Empty (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Dryer zone 2 current loop break (Group = Dryer, Category = Error) /// - [pbr::OriginalName("MidTank8Empty")] MidTank8Empty = 63, + [pbr::OriginalName("DRYER_HEATERS_ZONE_2_CURRENT_LOOP_BREAK")] DryerHeatersZone2CurrentLoopBreak = 63, /// - /// Mid Tank 1 Lowlevel (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Dryer fans RPM too low (Group = Dryer, Category = Warning) /// - [pbr::OriginalName("MidTank1Lowlevel")] MidTank1Lowlevel = 64, + [pbr::OriginalName("DRYER_FAN_RPM_TOO_LOW")] DryerFanRpmTooLow = 64, /// - /// Mid Tank 2 Lowlevel (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Dryer fan stopped (Group = Dryer, Category = Error) /// - [pbr::OriginalName("MidTank2Lowlevel")] MidTank2Lowlevel = 65, + [pbr::OriginalName("DRYER_FAN_STOPPED")] DryerFanStopped = 65, /// - /// Mid Tank 3 Lowlevel (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Overtemperature in dyeing head zone 1 (Group = DyeingHead, Category = Error) /// - [pbr::OriginalName("MidTank3Lowlevel")] MidTank3Lowlevel = 66, + [pbr::OriginalName("DYEING_HEAD_ZONE_1_OVERTEMPERATURE")] DyeingHeadZone1Overtemperature = 66, /// - /// Mid Tank 4 Lowlevel (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Overtemperature in dyeing head zone 2 (Group = DyeingHead, Category = Error) /// - [pbr::OriginalName("MidTank4Lowlevel")] MidTank4Lowlevel = 67, + [pbr::OriginalName("DYEING_HEAD_ZONE_2_OVERTEMPERATURE")] DyeingHeadZone2Overtemperature = 67, /// - /// Mid Tank 5 Lowlevel (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Overtemperature in dyeing head zone 3 (Group = DyeingHead, Category = Error) /// - [pbr::OriginalName("MidTank5Lowlevel")] MidTank5Lowlevel = 68, + [pbr::OriginalName("DYEING_HEAD_ZONE_3_OVERTEMPERATURE")] DyeingHeadZone3Overtemperature = 68, /// - /// Mid Tank 6 Lowlevel (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Overtemperature in dyeing head zone 4 (Group = DyeingHead, Category = Error) /// - [pbr::OriginalName("MidTank6Lowlevel")] MidTank6Lowlevel = 69, + [pbr::OriginalName("DYEING_HEAD_ZONE_4_OVERTEMPERATURE")] DyeingHeadZone4Overtemperature = 69, /// - /// Mid Tank 7 Lowlevel (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Overtemperature in dyeing head zone 5 (Group = DyeingHead, Category = Error) /// - [pbr::OriginalName("MidTank7Lowlevel")] MidTank7Lowlevel = 70, + [pbr::OriginalName("DYEING_HEAD_ZONE_5_OVERTEMPERATURE")] DyeingHeadZone5Overtemperature = 70, /// - /// Mid Tank 8 Lowlevel (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Overtemperature in dyeing head zone 6 (Group = DyeingHead, Category = Error) /// - [pbr::OriginalName("MidTank8Lowlevel")] MidTank8Lowlevel = 71, + [pbr::OriginalName("DYEING_HEAD_ZONE_6_OVERTEMPERATURE")] DyeingHeadZone6Overtemperature = 71, /// - /// Mid Tank 1 Not In Place (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Undertemperature in dyeing head zone 1 (Group = DyeingHead, Category = Error) /// - [pbr::OriginalName("MidTank1NotInPlace")] MidTank1NotInPlace = 72, + [pbr::OriginalName("DYEING_HEAD_ZONE_1_UNDERTEMPERATURE_A")] DyeingHeadZone1UndertemperatureA = 72, /// - /// Mid Tank 2 Not In Place (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Undertemperature in dyeing head zone 2 (Group = DyeingHead, Category = Error) /// - [pbr::OriginalName("MidTank2NotInPlace")] MidTank2NotInPlace = 73, + [pbr::OriginalName("DYEING_HEAD_ZONE_2_UNDERTEMPERATURE_A")] DyeingHeadZone2UndertemperatureA = 73, /// - /// Mid Tank 3 Not In Place (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Undertemperature in dyeing head zone 3 (Group = DyeingHead, Category = Error) /// - [pbr::OriginalName("MidTank3NotInPlace")] MidTank3NotInPlace = 74, + [pbr::OriginalName("DYEING_HEAD_ZONE_3_UNDERTEMPERATURE_A")] DyeingHeadZone3UndertemperatureA = 74, /// - /// Mid Tank 4 Not In Place (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Undertemperature in dyeing head zone 4 (Group = DyeingHead, Category = Error) /// - [pbr::OriginalName("MidTank4NotInPlace")] MidTank4NotInPlace = 75, + [pbr::OriginalName("DYEING_HEAD_ZONE_4_UNDERTEMPERATURE_A")] DyeingHeadZone4UndertemperatureA = 75, /// - /// Mid Tank 5 Not In Place (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Undertemperature in dyeing head zone 5 (Group = DyeingHead, Category = Error) /// - [pbr::OriginalName("MidTank5NotInPlace")] MidTank5NotInPlace = 76, + [pbr::OriginalName("DYEING_HEAD_ZONE_5_UNDERTEMPERATURE_A")] DyeingHeadZone5UndertemperatureA = 76, /// - /// Mid Tank 6 Not In Place (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Undertemperature in dyeing head zone 6 (Group = DyeingHead, Category = Error) /// - [pbr::OriginalName("MidTank6NotInPlace")] MidTank6NotInPlace = 77, + [pbr::OriginalName("DYEING_HEAD_ZONE_6_UNDERTEMPERATURE_A")] DyeingHeadZone6UndertemperatureA = 77, /// - /// Mid Tank 7 Not In Place (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Undertemperature in dyeing head zone 1 (Group = DyeingHead, Category = Error) /// - [pbr::OriginalName("MidTank7NotInPlace")] MidTank7NotInPlace = 78, + [pbr::OriginalName("DYEING_HEAD_ZONE_1_UNDERTEMPERATURE_B")] DyeingHeadZone1UndertemperatureB = 78, /// - /// Mid Tank 8 Not In Place (Group = Ink Delivery System, Category = Warning, Actions = ) + ///Undertemperature in dyeing head zone 2 (Group = DyeingHead, Category = Error) /// - [pbr::OriginalName("MidTank8NotInPlace")] MidTank8NotInPlace = 79, + [pbr::OriginalName("DYEING_HEAD_ZONE_2_UNDERTEMPERATURE_B")] DyeingHeadZone2UndertemperatureB = 79, /// - /// System Built In Test Fail (Group = General Hardware, Category = Critical, Actions = ) + ///Undertemperature in dyeing head zone 3 (Group = DyeingHead, Category = Error) /// - [pbr::OriginalName("SystemBITFail")] SystemBitfail = 80, + [pbr::OriginalName("DYEING_HEAD_ZONE_3_UNDERTEMPERATURE_B")] DyeingHeadZone3UndertemperatureB = 80, /// - /// General Internal Over Temperature (Group = General Hardware, Category = Critical, Actions = ) + ///Undertemperature in dyeing head zone 4 (Group = DyeingHead, Category = Error) /// - [pbr::OriginalName("GeneralInternalOverTemperature")] GeneralInternalOverTemperature = 81, + [pbr::OriginalName("DYEING_HEAD_ZONE_4_UNDERTEMPERATURE_B")] DyeingHeadZone4UndertemperatureB = 81, /// - /// Machine Cover Open (Group = General Hardware, Category = Warning, Actions = ) + ///Undertemperature in dyeing head zone 5 (Group = DyeingHead, Category = Error) /// - [pbr::OriginalName("MachineCoverOpen")] MachineCoverOpen = 82, + [pbr::OriginalName("DYEING_HEAD_ZONE_5_UNDERTEMPERATURE_B")] DyeingHeadZone5UndertemperatureB = 82, /// - /// Emergency Push Button Pressed (Group = General Hardware, Category = Critical, Actions = ) + ///Undertemperature in dyeing head zone 6 (Group = DyeingHead, Category = Error) /// - [pbr::OriginalName("EmergencyPushButtonPressed")] EmergencyPushButtonPressed = 83, + [pbr::OriginalName("DYEING_HEAD_ZONE_6_UNDERTEMPERATURE_B")] DyeingHeadZone6UndertemperatureB = 83, /// - /// System General Error (Group = General Hardware, Category = Error, Actions = ) + ///Dyeing head zone 1 current out of range (Group = DyeingHead, Category = Error) /// - [pbr::OriginalName("SystemGeneralError")] SystemGeneralError = 84, + [pbr::OriginalName("DYEING_HEAD_ZONE_1_CURRENT_OUT_OF_RANGE")] DyeingHeadZone1CurrentOutOfRange = 84, /// - /// Motor Dryer Over Current (Group = Thread Feeding System, Category = Error, Actions = ) + ///Dyeing head zone 2 current out of range (Group = DyeingHead, Category = Error) /// - [pbr::OriginalName("MotorDryerOverCurrent")] MotorDryerOverCurrent = 93, + [pbr::OriginalName("DYEING_HEAD_ZONE_2_CURRENT_OUT_OF_RANGE")] DyeingHeadZone2CurrentOutOfRange = 85, /// - /// Motor Feeder Over Current (Group = Thread Feeding System, Category = Error, Actions = ) + ///Dyeing head zone 3 current out of range (Group = DyeingHead, Category = Error) /// - [pbr::OriginalName("MotorFeederOverCurrent")] MotorFeederOverCurrent = 94, + [pbr::OriginalName("DYEING_HEAD_ZONE_3_CURRENT_OUT_OF_RANGE")] DyeingHeadZone3CurrentOutOfRange = 86, /// - /// Motor Right Loader Over Current (Group = Thread Feeding System, Category = Error, Actions = ) + ///Dyeing head zone 4 current out of range (Group = DyeingHead, Category = Error) /// - [pbr::OriginalName("MotorRLoaderOverCurrent")] MotorRloaderOverCurrent = 95, + [pbr::OriginalName("DYEING_HEAD_ZONE_4_CURRENT_OUT_OF_RANGE")] DyeingHeadZone4CurrentOutOfRange = 87, /// - /// Motor Pooler Over Current (Group = Thread Feeding System, Category = Error, Actions = ) + ///Dyeing head zones 5 and 6 current out of range (Group = DyeingHead, Category = Error) /// - [pbr::OriginalName("MotorPoolerOverCurrent")] MotorPoolerOverCurrent = 96, + [pbr::OriginalName("DYEING_HEAD_ZONE_5_6_CURRENT_OUT_OF_RANGE")] DyeingHeadZone56CurrentOutOfRange = 88, /// - /// Motor Left Loader Over Current (Group = Thread Feeding System, Category = Error, Actions = ) + ///Dyeing head zone 1 current loop break (Group = DyeingHead, Category = Error) /// - [pbr::OriginalName("MotorLLoaderOverCurrent")] MotorLloaderOverCurrent = 97, + [pbr::OriginalName("DYEING_HEAD_ZONE_1_CURRENT_LOOP_BREAK")] DyeingHeadZone1CurrentLoopBreak = 89, /// - /// Motor Winder Over Current (Group = Thread Feeding System, Category = Error, Actions = ) + ///Dyeing head zone 2 current loop break (Group = DyeingHead, Category = Error) /// - [pbr::OriginalName("MotorWinderOverCurrent")] MotorWinderOverCurrent = 98, + [pbr::OriginalName("DYEING_HEAD_ZONE_2_CURRENT_LOOP_BREAK")] DyeingHeadZone2CurrentLoopBreak = 90, /// - /// Motor Screw Over Current (Group = Thread Feeding System, Category = Error, Actions = ) + ///Dyeing head zone 3 current loop break (Group = DyeingHead, Category = Error) /// - [pbr::OriginalName("MotorScrewOverCurrent")] MotorScrewOverCurrent = 99, + [pbr::OriginalName("DYEING_HEAD_ZONE_3_CURRENT_LOOP_BREAK")] DyeingHeadZone3CurrentLoopBreak = 91, /// - /// Motor Loading Arm Over Current (Group = Thread Feeding System, Category = Error, Actions = ) + ///Dyeing head zone 4 current loop break (Group = DyeingHead, Category = Error) /// - [pbr::OriginalName("MotorLoadingArmOverCurrent")] MotorLoadingArmOverCurrent = 100, + [pbr::OriginalName("DYEING_HEAD_ZONE_4_CURRENT_LOOP_BREAK")] DyeingHeadZone4CurrentLoopBreak = 92, /// - /// Motor Dispenser 1 Over Current (Group = Ink Delivery System, Category = Error, Actions = ) + ///Dyeing head zone 5 and 6 current loop break (Group = DyeingHead, Category = Error) /// - [pbr::OriginalName("MotorDispenser1OverCurrent")] MotorDispenser1OverCurrent = 101, + [pbr::OriginalName("DYEING_HEAD_ZONE_5_6_CURRENT_LOOP_BREAK")] DyeingHeadZone56CurrentLoopBreak = 93, /// - /// Motor Dispenser 2 Over Current (Group = Ink Delivery System, Category = Error, Actions = ) + ///Overheating in dyeing head (Group = DyeingHead, Category = Safety) /// - [pbr::OriginalName("MotorDispenser2OverCurrent")] MotorDispenser2OverCurrent = 102, + [pbr::OriginalName("DYEING_HEAD_THERMAL_CUTOFF")] DyeingHeadThermalCutoff = 94, /// - /// Motor Dispenser 3 Over Current (Group = Ink Delivery System, Category = Error, Actions = ) + ///Could not open dyeing head cover (Group = DyeingHead, Category = Error) /// - [pbr::OriginalName("MotorDispenser3OverCurrent")] MotorDispenser3OverCurrent = 103, + [pbr::OriginalName("DYEING_HEAD_COVER_OPEN_TIMEOUT")] DyeingHeadCoverOpenTimeout = 95, /// - /// Motor Dispenser 4 Over Current (Group = Ink Delivery System, Category = Error, Actions = ) + ///Could not close dyeing head cover (Group = DyeingHead, Category = Error) /// - [pbr::OriginalName("MotorDispenser4OverCurrent")] MotorDispenser4OverCurrent = 104, + [pbr::OriginalName("DYEING_HEAD_COVER_CLOSE_TIMEOUT")] DyeingHeadCoverCloseTimeout = 96, /// - /// Motor Dispenser 5 Over Current (Group = Ink Delivery System, Category = Error, Actions = ) + ///Overtemperature in mixer (Group = Mixer, Category = Error) /// - [pbr::OriginalName("MotorDispenser5OverCurrent")] MotorDispenser5OverCurrent = 105, + [pbr::OriginalName("MIXER_OVERTEMPERATURE")] MixerOvertemperature = 97, /// - /// Motor Dispenser 6 Over Current (Group = Ink Delivery System, Category = Error, Actions = ) + ///Undertemperature in mixer (Group = Mixer, Category = Error) /// - [pbr::OriginalName("MotorDispenser6OverCurrent")] MotorDispenser6OverCurrent = 106, + [pbr::OriginalName("MIXER_UNDERTEMPERATURE_A")] MixerUndertemperatureA = 98, /// - /// Motor Dispenser 7 Over Current (Group = Ink Delivery System, Category = Error, Actions = ) + ///Undertemperature in mixer (Group = Mixer, Category = Error) /// - [pbr::OriginalName("MotorDispenser7OverCurrent")] MotorDispenser7OverCurrent = 107, + [pbr::OriginalName("MIXER_UNDERTEMPERATURE_B")] MixerUndertemperatureB = 99, /// - /// Motor Dispenser 8 Over Current (Group = Ink Delivery System, Category = Error, Actions = ) + ///Overheating in mixer (Group = Mixer, Category = Safety) /// - [pbr::OriginalName("MotorDispenser8OverCurrent")] MotorDispenser8OverCurrent = 108, + [pbr::OriginalName("MIXER_THERMAL_CUTOFF")] MixerThermalCutoff = 100, /// - /// Motor Dryer Over Temperature (Group = Thread Feeding System, Category = Error, Actions = ) + ///Mixer current out of range (Group = Mixer, Category = Error) /// - [pbr::OriginalName("MotorDryerOverTemperature")] MotorDryerOverTemperature = 109, + [pbr::OriginalName("MIXER_CURRENT_OUT_OF_RANGE")] MixerCurrentOutOfRange = 101, /// - /// Motor Feeder Over Temperature (Group = Thread Feeding System, Category = Error, Actions = ) + ///Mixer current loop break (Group = Mixer, Category = Error) /// - [pbr::OriginalName("MotorFeederOverTemperature")] MotorFeederOverTemperature = 110, + [pbr::OriginalName("MIXER_CURRENT_LOOP_BREAK")] MixerCurrentLoopBreak = 102, /// - /// Motor Right Loader Over Temperature (Group = Thread Feeding System, Category = Error, Actions = ) + ///Overpressure in dispenser 1 (Group = Dispensers, Category = Error) /// - [pbr::OriginalName("MotorRLoaderOverTemperature")] MotorRloaderOverTemperature = 111, + [pbr::OriginalName("DISPENSER_1_OVERPRESSURE")] Dispenser1Overpressure = 103, /// - /// Motor Pooler Over Temperature (Group = Thread Feeding System, Category = Error, Actions = ) + ///Overpressure in dispenser 2 (Group = Dispensers, Category = Error) /// - [pbr::OriginalName("MotorPoolerOverTemperature")] MotorPoolerOverTemperature = 112, + [pbr::OriginalName("DISPENSER_2_OVERPRESSURE")] Dispenser2Overpressure = 104, /// - /// Motor Left Loader Over Temperature (Group = Thread Feeding System, Category = Error, Actions = ) + ///Overpressure in dispenser 3 (Group = Dispensers, Category = Error) /// - [pbr::OriginalName("MotorLLoaderOverTemperature")] MotorLloaderOverTemperature = 113, + [pbr::OriginalName("DISPENSER_3_OVERPRESSURE")] Dispenser3Overpressure = 105, /// - /// Motor Winder Over Temperature (Group = Thread Feeding System, Category = Error, Actions = ) + ///Overpressure in dispenser 4 (Group = Dispensers, Category = Error) /// - [pbr::OriginalName("MotorWinderOverTemperature")] MotorWinderOverTemperature = 114, + [pbr::OriginalName("DISPENSER_4_OVERPRESSURE")] Dispenser4Overpressure = 106, /// - /// Motor Screw Over Temperature (Group = Thread Feeding System, Category = Error, Actions = ) + ///Overpressure in dispenser 5 (Group = Dispensers, Category = Error) /// - [pbr::OriginalName("MotorScrewOverTemperature")] MotorScrewOverTemperature = 115, + [pbr::OriginalName("DISPENSER_5_OVERPRESSURE")] Dispenser5Overpressure = 107, /// - /// Motor Loading Arm Over Temperature (Group = Thread Feeding System, Category = Error, Actions = ) + ///Overpressure in dispenser 6 (Group = Dispensers, Category = Error) /// - [pbr::OriginalName("MotorLoadingArmOverTemperature")] MotorLoadingArmOverTemperature = 116, + [pbr::OriginalName("DISPENSER_6_OVERPRESSURE")] Dispenser6Overpressure = 108, /// - /// Motor Dispenser 1 Over Temperature (Group = Ink Delivery System, Category = Error, Actions = ) + ///Overpressure in dispenser 7 (Group = Dispensers, Category = Error) /// - [pbr::OriginalName("MotorDispenser1OverTemperature")] MotorDispenser1OverTemperature = 117, + [pbr::OriginalName("DISPENSER_7_OVERPRESSURE")] Dispenser7Overpressure = 109, /// - /// Motor Dispenser 2 Over Temperature (Group = Ink Delivery System, Category = Error, Actions = ) + ///Overpressure in dispenser 8 (Group = Dispensers, Category = Error) /// - [pbr::OriginalName("MotorDispenser2OverTemperature")] MotorDispenser2OverTemperature = 118, + [pbr::OriginalName("DISPENSER_8_OVERPRESSURE")] Dispenser8Overpressure = 110, /// - /// Motor Dispenser 3 Over Temperature (Group = Ink Delivery System, Category = Error, Actions = ) + ///Underpressure in dispenser 1 (Group = Dispensers, Category = Error) /// - [pbr::OriginalName("MotorDispenser3OverTemperature")] MotorDispenser3OverTemperature = 119, + [pbr::OriginalName("DISPENSER_1_UNDERPRESSURE")] Dispenser1Underpressure = 111, /// - /// Motor Dispenser 4 Over Temperature (Group = Ink Delivery System, Category = Error, Actions = ) + ///Underpressure in dispenser 2 (Group = Dispensers, Category = Error) /// - [pbr::OriginalName("MotorDispenser4OverTemperature")] MotorDispenser4OverTemperature = 120, + [pbr::OriginalName("DISPENSER_2_UNDERPRESSURE")] Dispenser2Underpressure = 112, /// - /// Motor Dispenser 5 Over Temperature (Group = Ink Delivery System, Category = Error, Actions = ) + ///Underpressure in dispenser 3 (Group = Dispensers, Category = Error) /// - [pbr::OriginalName("MotorDispenser5OverTemperature")] MotorDispenser5OverTemperature = 121, + [pbr::OriginalName("DISPENSER_3_UNDERPRESSURE")] Dispenser3Underpressure = 113, /// - /// Motor Dispenser 6 Over Temperature (Group = Ink Delivery System, Category = Error, Actions = ) + ///Underpressure in dispenser 4 (Group = Dispensers, Category = Error) /// - [pbr::OriginalName("MotorDispenser6OverTemperature")] MotorDispenser6OverTemperature = 122, + [pbr::OriginalName("DISPENSER_4_UNDERPRESSURE")] Dispenser4Underpressure = 114, /// - /// Motor Dispenser 7 Over Temperature (Group = Ink Delivery System, Category = Error, Actions = ) + ///Underpressure in dispenser 5 (Group = Dispensers, Category = Error) /// - [pbr::OriginalName("MotorDispenser7OverTemperature")] MotorDispenser7OverTemperature = 123, + [pbr::OriginalName("DISPENSER_5_UNDERPRESSURE")] Dispenser5Underpressure = 115, /// - /// Motor Dispenser 8 Over Temperature (Group = Ink Delivery System, Category = Error, Actions = ) + ///Underpressure in dispenser 6 (Group = Dispensers, Category = Error) /// - [pbr::OriginalName("MotorDispenser8OverTemperature")] MotorDispenser8OverTemperature = 124, + [pbr::OriginalName("DISPENSER_6_UNDERPRESSURE")] Dispenser6Underpressure = 116, /// - /// Motor Dryer Stall (Group = Thread Feeding System, Category = Error, Actions = ) + ///Underpressure in dispenser 7 (Group = Dispensers, Category = Error) /// - [pbr::OriginalName("MotorDryerStall")] MotorDryerStall = 125, + [pbr::OriginalName("DISPENSER_7_UNDERPRESSURE")] Dispenser7Underpressure = 117, /// - /// Motor Feeder Stall (Group = Thread Feeding System, Category = Error, Actions = ) + ///Underpressure in dispenser 8 (Group = Dispensers, Category = Error) /// - [pbr::OriginalName("MotorFeederStall")] MotorFeederStall = 126, + [pbr::OriginalName("DISPENSER_8_UNDERPRESSURE")] Dispenser8Underpressure = 118, /// - /// Motor Right Loader Stall (Group = Thread Feeding System, Category = Error, Actions = ) + ///Dispenser 1 empty (Group = Dispensers, Category = Error) /// - [pbr::OriginalName("MotorRLoaderStall")] MotorRloaderStall = 127, + [pbr::OriginalName("DISPENSER_1_EMPTY")] Dispenser1Empty = 119, /// - /// Motor Pooler Stall (Group = Thread Feeding System, Category = Error, Actions = ) + ///Dispenser 2 empty (Group = Dispensers, Category = Error) /// - [pbr::OriginalName("MotorPoolerStall")] MotorPoolerStall = 128, + [pbr::OriginalName("DISPENSER_2_EMPTY")] Dispenser2Empty = 120, /// - /// Motor Left Loader Stall (Group = Thread Feeding System, Category = Error, Actions = ) + ///Dispenser 3 empty (Group = Dispensers, Category = Error) /// - [pbr::OriginalName("MotorLLoaderStall")] MotorLloaderStall = 129, + [pbr::OriginalName("DISPENSER_3_EMPTY")] Dispenser3Empty = 121, /// - /// Motor Winder Stall (Group = Thread Feeding System, Category = Error, Actions = ) + ///Dispenser 4 empty (Group = Dispensers, Category = Error) /// - [pbr::OriginalName("MotorWinderStall")] MotorWinderStall = 130, + [pbr::OriginalName("DISPENSER_4_EMPTY")] Dispenser4Empty = 122, /// - /// Motor Screw Stall (Group = Thread Feeding System, Category = Error, Actions = ) + ///Dispenser 5 empty (Group = Dispensers, Category = Error) /// - [pbr::OriginalName("MotorScrewStall")] MotorScrewStall = 131, + [pbr::OriginalName("DISPENSER_5_EMPTY")] Dispenser5Empty = 123, /// - /// Motor Loading Arm Stall (Group = Thread Feeding System, Category = Error, Actions = ) + ///Dispenser 6 empty (Group = Dispensers, Category = Error) /// - [pbr::OriginalName("MotorLoadingArmStall")] MotorLoadingArmStall = 132, + [pbr::OriginalName("DISPENSER_6_EMPTY")] Dispenser6Empty = 124, /// - /// Motor Dispenser 1 Stall (Group = Ink Delivery System, Category = Error, Actions = ) + ///Dispenser 7 empty (Group = Dispensers, Category = Error) /// - [pbr::OriginalName("MotorDispenser1Stall")] MotorDispenser1Stall = 133, + [pbr::OriginalName("DISPENSER_7_EMPTY")] Dispenser7Empty = 125, /// - /// Motor Dispenser 2 Stall (Group = Ink Delivery System, Category = Error, Actions = ) + ///Dispenser 8 empty (Group = Dispensers, Category = Error) /// - [pbr::OriginalName("MotorDispenser2Stall")] MotorDispenser2Stall = 134, + [pbr::OriginalName("DISPENSER_8_EMPTY")] Dispenser8Empty = 126, /// - /// Motor Dispenser 3 Stall (Group = Ink Delivery System, Category = Error, Actions = ) + ///Failed to refill dispenser 1 (Group = Dispensers, Category = Warning) /// - [pbr::OriginalName("MotorDispenser3Stall")] MotorDispenser3Stall = 135, + [pbr::OriginalName("DISPENSER_1_REFILL_FAILURE")] Dispenser1RefillFailure = 127, /// - /// Motor Dispenser 4 Stall (Group = Ink Delivery System, Category = Error, Actions = ) + ///Failed to refill dispenser 2 (Group = Dispensers, Category = Warning) /// - [pbr::OriginalName("MotorDispenser4Stall")] MotorDispenser4Stall = 136, + [pbr::OriginalName("DISPENSER_2_REFILL_FAILURE")] Dispenser2RefillFailure = 128, /// - /// Motor Dispenser 5 Stall (Group = Ink Delivery System, Category = Error, Actions = ) + ///Failed to refill dispenser 3 (Group = Dispensers, Category = Warning) /// - [pbr::OriginalName("MotorDispenser5Stall")] MotorDispenser5Stall = 137, + [pbr::OriginalName("DISPENSER_3_REFILL_FAILURE")] Dispenser3RefillFailure = 129, /// - /// Motor Dispenser 6 Stall (Group = Ink Delivery System, Category = Error, Actions = ) + ///Failed to refill dispenser 4 (Group = Dispensers, Category = Warning) /// - [pbr::OriginalName("MotorDispenser6Stall")] MotorDispenser6Stall = 138, + [pbr::OriginalName("DISPENSER_4_REFILL_FAILURE")] Dispenser4RefillFailure = 130, /// - /// Motor Dispenser 7 Stall (Group = Ink Delivery System, Category = Error, Actions = ) + ///Failed to refill dispenser 5 (Group = Dispensers, Category = Warning) /// - [pbr::OriginalName("MotorDispenser7Stall")] MotorDispenser7Stall = 139, + [pbr::OriginalName("DISPENSER_5_REFILL_FAILURE")] Dispenser5RefillFailure = 131, /// - /// Motor Dispenser 8 Stall (Group = Ink Delivery System, Category = Error, Actions = ) + ///Failed to refill dispenser 6 (Group = Dispensers, Category = Warning) /// - [pbr::OriginalName("MotorDispenser8Stall")] MotorDispenser8Stall = 140, + [pbr::OriginalName("DISPENSER_6_REFILL_FAILURE")] Dispenser6RefillFailure = 132, /// - /// Motor Dryer Under Voltage (Group = Thread Feeding System, Category = Error, Actions = ) + ///Failed to refill dispenser 7 (Group = Dispensers, Category = Warning) /// - [pbr::OriginalName("MotorDryerUnderVoltage")] MotorDryerUnderVoltage = 141, + [pbr::OriginalName("DISPENSER_7_REFILL_FAILURE")] Dispenser7RefillFailure = 133, /// - /// Motor Feeder Under Voltage (Group = Thread Feeding System, Category = Error, Actions = ) + ///Failed to refill dispenser 8 (Group = Dispensers, Category = Warning) /// - [pbr::OriginalName("MotorFeederUnderVoltage")] MotorFeederUnderVoltage = 142, + [pbr::OriginalName("DISPENSER_8_REFILL_FAILURE")] Dispenser8RefillFailure = 134, /// - /// Motor Right Loader Under Voltage (Group = Thread Feeding System, Category = Error, Actions = ) + ///Overcurrent in dispenser 1 motor (Group = Dispensers, Category = Error) /// - [pbr::OriginalName("MotorRLoaderUnderVoltage")] MotorRloaderUnderVoltage = 143, + [pbr::OriginalName("DISPENSER_1_MOTOR_OVERCURRENT")] Dispenser1MotorOvercurrent = 135, /// - /// Motor Pooler Under Voltage (Group = Thread Feeding System, Category = Error, Actions = ) + ///Overcurrent in dispenser 2 motor (Group = Dispensers, Category = Error) /// - [pbr::OriginalName("MotorPoolerUnderVoltage")] MotorPoolerUnderVoltage = 144, + [pbr::OriginalName("DISPENSER_2_MOTOR_OVERCURRENT")] Dispenser2MotorOvercurrent = 136, /// - /// Motor Left Loader Under Voltage (Group = Thread Feeding System, Category = Error, Actions = ) + ///Overcurrent in dispenser 3 motor (Group = Dispensers, Category = Error) /// - [pbr::OriginalName("MotorLLoaderUnderVoltage")] MotorLloaderUnderVoltage = 145, + [pbr::OriginalName("DISPENSER_3_MOTOR_OVERCURRENT")] Dispenser3MotorOvercurrent = 137, /// - /// Motor Winder Under Voltage (Group = Thread Feeding System, Category = Error, Actions = ) + ///Overcurrent in dispenser 4 motor (Group = Dispensers, Category = Error) /// - [pbr::OriginalName("MotorWinderUnderVoltage")] MotorWinderUnderVoltage = 146, + [pbr::OriginalName("DISPENSER_4_MOTOR_OVERCURRENT")] Dispenser4MotorOvercurrent = 138, /// - /// Motor Screw Under Voltage (Group = Thread Feeding System, Category = Error, Actions = ) + ///Overcurrent in dispenser 5 motor (Group = Dispensers, Category = Error) /// - [pbr::OriginalName("MotorScrewUnderVoltage")] MotorScrewUnderVoltage = 147, + [pbr::OriginalName("DISPENSER_5_MOTOR_OVERCURRENT")] Dispenser5MotorOvercurrent = 139, /// - /// Motor Loading Arm Under Voltage (Group = Thread Feeding System, Category = Error, Actions = ) + ///Overcurrent in dispenser 6 motor (Group = Dispensers, Category = Error) /// - [pbr::OriginalName("MotorLoadingArmUnderVoltage")] MotorLoadingArmUnderVoltage = 148, + [pbr::OriginalName("DISPENSER_6_MOTOR_OVERCURRENT")] Dispenser6MotorOvercurrent = 140, /// - /// Motor Dispenser 1 Under Voltage (Group = Ink Delivery System, Category = Error, Actions = ) + ///Overcurrent in dispenser 7 motor (Group = Dispensers, Category = Error) /// - [pbr::OriginalName("MotorDispenser1UnderVoltage")] MotorDispenser1UnderVoltage = 149, + [pbr::OriginalName("DISPENSER_7_MOTOR_OVERCURRENT")] Dispenser7MotorOvercurrent = 141, /// - /// Motor Dispenser 2 Under Voltage (Group = Ink Delivery System, Category = Error, Actions = ) + ///Overcurrent in dispenser 8 motor (Group = Dispensers, Category = Error) /// - [pbr::OriginalName("MotorDispenser2UnderVoltage")] MotorDispenser2UnderVoltage = 150, + [pbr::OriginalName("DISPENSER_8_MOTOR_OVERCURRENT")] Dispenser8MotorOvercurrent = 142, /// - /// Motor Dispenser 3 Under Voltage (Group = Ink Delivery System, Category = Error, Actions = ) + ///Overtemperature in dispenser 1 motor (Group = Dispensers, Category = Error) /// - [pbr::OriginalName("MotorDispenser3UnderVoltage")] MotorDispenser3UnderVoltage = 151, + [pbr::OriginalName("DISPENSER_1_MOTOR_OVERTEMPERATURE")] Dispenser1MotorOvertemperature = 143, /// - /// Motor Dispenser 4 Under Voltage (Group = Ink Delivery System, Category = Error, Actions = ) + ///Overtemperature in dispenser 2 motor (Group = Dispensers, Category = Error) /// - [pbr::OriginalName("MotorDispenser4UnderVoltage")] MotorDispenser4UnderVoltage = 152, + [pbr::OriginalName("DISPENSER_2_MOTOR_OVERTEMPERATURE")] Dispenser2MotorOvertemperature = 144, /// - /// Motor Dispenser 5 Under Voltage (Group = Ink Delivery System, Category = Error, Actions = ) + ///Overtemperature in dispenser 3 motor (Group = Dispensers, Category = Error) /// - [pbr::OriginalName("MotorDispenser5UnderVoltage")] MotorDispenser5UnderVoltage = 153, + [pbr::OriginalName("DISPENSER_3_MOTOR_OVERTEMPERATURE")] Dispenser3MotorOvertemperature = 145, /// - /// Motor Dispenser 6 Under Voltage (Group = Ink Delivery System, Category = Error, Actions = ) + ///Overtemperature in dispenser 4 motor (Group = Dispensers, Category = Error) /// - [pbr::OriginalName("MotorDispenser6UnderVoltage")] MotorDispenser6UnderVoltage = 154, + [pbr::OriginalName("DISPENSER_4_MOTOR_OVERTEMPERATURE")] Dispenser4MotorOvertemperature = 146, /// - /// Motor Dispenser 7 Under Voltage (Group = Ink Delivery System, Category = Error, Actions = ) + ///Overtemperature in dispenser 5 motor (Group = Dispensers, Category = Error) /// - [pbr::OriginalName("MotorDispenser7UnderVoltage")] MotorDispenser7UnderVoltage = 155, + [pbr::OriginalName("DISPENSER_5_MOTOR_OVERTEMPERATURE")] Dispenser5MotorOvertemperature = 147, /// - /// Motor Dispenser 8 Under Voltage (Group = Ink Delivery System, Category = Error, Actions = ) + ///Overtemperature in dispenser 6 motor (Group = Dispensers, Category = Error) /// - [pbr::OriginalName("MotorDispenser8UnderVoltage")] MotorDispenser8UnderVoltage = 156, + [pbr::OriginalName("DISPENSER_6_MOTOR_OVERTEMPERATURE")] Dispenser6MotorOvertemperature = 148, + /// + ///Overtemperature in dispenser 7 motor (Group = Dispensers, Category = Error) + /// + [pbr::OriginalName("DISPENSER_7_MOTOR_OVERTEMPERATURE")] Dispenser7MotorOvertemperature = 149, + /// + ///Overtemperature in dispenser 8 motor (Group = Dispensers, Category = Error) + /// + [pbr::OriginalName("DISPENSER_8_MOTOR_OVERTEMPERATURE")] Dispenser8MotorOvertemperature = 150, + /// + ///Dispenser 1 motor stalled (Group = Dispensers, Category = Error) + /// + [pbr::OriginalName("DISPENSER_1_MOTOR_STALL")] Dispenser1MotorStall = 151, + /// + ///Dispenser 2 motor stalled (Group = Dispensers, Category = Error) + /// + [pbr::OriginalName("DISPENSER_2_MOTOR_STALL")] Dispenser2MotorStall = 152, + /// + ///Dispenser 3 motor stalled (Group = Dispensers, Category = Error) + /// + [pbr::OriginalName("DISPENSER_3_MOTOR_STALL")] Dispenser3MotorStall = 153, + /// + ///Dispenser 4 motor stalled (Group = Dispensers, Category = Error) + /// + [pbr::OriginalName("DISPENSER_4_MOTOR_STALL")] Dispenser4MotorStall = 154, + /// + ///Dispenser 5 motor stalled (Group = Dispensers, Category = Error) + /// + [pbr::OriginalName("DISPENSER_5_MOTOR_STALL")] Dispenser5MotorStall = 155, + /// + ///Dispenser 6 motor stalled (Group = Dispensers, Category = Error) + /// + [pbr::OriginalName("DISPENSER_6_MOTOR_STALL")] Dispenser6MotorStall = 156, + /// + ///Dispenser 7 motor stalled (Group = Dispensers, Category = Error) + /// + [pbr::OriginalName("DISPENSER_7_MOTOR_STALL")] Dispenser7MotorStall = 157, + /// + ///Dispenser 8 motor stalled (Group = Dispensers, Category = Error) + /// + [pbr::OriginalName("DISPENSER_8_MOTOR_STALL")] Dispenser8MotorStall = 158, + /// + ///Undervoltage in dispenser 1 motor (Group = Dispensers, Category = Error) + /// + [pbr::OriginalName("DISPENSER_1_MOTOR_UNDERVOLTAGE")] Dispenser1MotorUndervoltage = 159, + /// + ///Undervoltage in dispenser 2 motor (Group = Dispensers, Category = Error) + /// + [pbr::OriginalName("DISPENSER_2_MOTOR_UNDERVOLTAGE")] Dispenser2MotorUndervoltage = 160, + /// + ///Undervoltage in dispenser 3 motor (Group = Dispensers, Category = Error) + /// + [pbr::OriginalName("DISPENSER_3_MOTOR_UNDERVOLTAGE")] Dispenser3MotorUndervoltage = 161, + /// + ///Undervoltage in dispenser 4 motor (Group = Dispensers, Category = Error) + /// + [pbr::OriginalName("DISPENSER_4_MOTOR_UNDERVOLTAGE")] Dispenser4MotorUndervoltage = 162, + /// + ///Undervoltage in dispenser 5 motor (Group = Dispensers, Category = Error) + /// + [pbr::OriginalName("DISPENSER_5_MOTOR_UNDERVOLTAGE")] Dispenser5MotorUndervoltage = 163, + /// + ///Undervoltage in dispenser 6 motor (Group = Dispensers, Category = Error) + /// + [pbr::OriginalName("DISPENSER_6_MOTOR_UNDERVOLTAGE")] Dispenser6MotorUndervoltage = 164, + /// + ///Undervoltage in dispenser 7 motor (Group = Dispensers, Category = Error) + /// + [pbr::OriginalName("DISPENSER_7_MOTOR_UNDERVOLTAGE")] Dispenser7MotorUndervoltage = 165, + /// + ///Undervoltage in dispenser 8 motor (Group = Dispensers, Category = Error) + /// + [pbr::OriginalName("DISPENSER_8_MOTOR_UNDERVOLTAGE")] Dispenser8MotorUndervoltage = 166, + /// + ///Low level in mid-tank 1 (Group = InkDeliverySystem, Category = Warning) + /// + [pbr::OriginalName("MID_TANK_1_LOW_LEVEL")] MidTank1LowLevel = 167, + /// + ///Low level in mid-tank 2 (Group = InkDeliverySystem, Category = Warning) + /// + [pbr::OriginalName("MID_TANK_2_LOW_LEVEL")] MidTank2LowLevel = 168, + /// + ///Low level in mid-tank 3 (Group = InkDeliverySystem, Category = Warning) + /// + [pbr::OriginalName("MID_TANK_3_LOW_LEVEL")] MidTank3LowLevel = 169, + /// + ///Low level in mid-tank 4 (Group = InkDeliverySystem, Category = Warning) + /// + [pbr::OriginalName("MID_TANK_4_LOW_LEVEL")] MidTank4LowLevel = 170, + /// + ///Low level in mid-tank 5 (Group = InkDeliverySystem, Category = Warning) + /// + [pbr::OriginalName("MID_TANK_5_LOW_LEVEL")] MidTank5LowLevel = 171, + /// + ///Low level in mid-tank 6 (Group = InkDeliverySystem, Category = Warning) + /// + [pbr::OriginalName("MID_TANK_6_LOW_LEVEL")] MidTank6LowLevel = 172, + /// + ///Low level in mid-tank 7 (Group = InkDeliverySystem, Category = Warning) + /// + [pbr::OriginalName("MID_TANK_7_LOW_LEVEL")] MidTank7LowLevel = 173, + /// + ///Low level in mid-tank 8 (Group = InkDeliverySystem, Category = Warning) + /// + [pbr::OriginalName("MID_TANK_8_LOW_LEVEL")] MidTank8LowLevel = 174, + /// + ///Mid-tank 1 empty (Group = InkDeliverySystem, Category = Error) + /// + [pbr::OriginalName("MID_TANK_1_EMPTY")] MidTank1Empty = 175, + /// + ///Mid-tank 2 empty (Group = InkDeliverySystem, Category = Error) + /// + [pbr::OriginalName("MID_TANK_2_EMPTY")] MidTank2Empty = 176, + /// + ///Mid-tank 3 empty (Group = InkDeliverySystem, Category = Error) + /// + [pbr::OriginalName("MID_TANK_3_EMPTY")] MidTank3Empty = 177, + /// + ///Mid-tank 4 empty (Group = InkDeliverySystem, Category = Error) + /// + [pbr::OriginalName("MID_TANK_4_EMPTY")] MidTank4Empty = 178, + /// + ///Mid-tank 5 empty (Group = InkDeliverySystem, Category = Error) + /// + [pbr::OriginalName("MID_TANK_5_EMPTY")] MidTank5Empty = 179, + /// + ///Mid-tank 6 empty (Group = InkDeliverySystem, Category = Error) + /// + [pbr::OriginalName("MID_TANK_6_EMPTY")] MidTank6Empty = 180, + /// + ///Mid-tank 7 empty (Group = InkDeliverySystem, Category = Error) + /// + [pbr::OriginalName("MID_TANK_7_EMPTY")] MidTank7Empty = 181, + /// + ///Mid-tank 8 empty (Group = InkDeliverySystem, Category = Error) + /// + [pbr::OriginalName("MID_TANK_8_EMPTY")] MidTank8Empty = 182, + /// + ///Overflow in mid-tank 1 (Group = InkDeliverySystem, Category = Warning) + /// + [pbr::OriginalName("MID_TANK_1_OVERFLOW")] MidTank1Overflow = 183, + /// + ///Overflow in mid-tank 2 (Group = InkDeliverySystem, Category = Warning) + /// + [pbr::OriginalName("MID_TANK_2_OVERFLOW")] MidTank2Overflow = 184, + /// + ///Overflow in mid-tank 3 (Group = InkDeliverySystem, Category = Warning) + /// + [pbr::OriginalName("MID_TANK_3_OVERFLOW")] MidTank3Overflow = 185, + /// + ///Overflow in mid-tank 4 (Group = InkDeliverySystem, Category = Warning) + /// + [pbr::OriginalName("MID_TANK_4_OVERFLOW")] MidTank4Overflow = 186, + /// + ///Overflow in mid-tank 5 (Group = InkDeliverySystem, Category = Warning) + /// + [pbr::OriginalName("MID_TANK_5_OVERFLOW")] MidTank5Overflow = 187, + /// + ///Overflow in mid-tank 6 (Group = InkDeliverySystem, Category = Warning) + /// + [pbr::OriginalName("MID_TANK_6_OVERFLOW")] MidTank6Overflow = 188, + /// + ///Overflow in mid-tank 7 (Group = InkDeliverySystem, Category = Warning) + /// + [pbr::OriginalName("MID_TANK_7_OVERFLOW")] MidTank7Overflow = 189, + /// + ///Overflow in mid-tank 8 (Group = InkDeliverySystem, Category = Warning) + /// + [pbr::OriginalName("MID_TANK_8_OVERFLOW")] MidTank8Overflow = 190, + /// + ///Air filter not present (Group = WasteHandlingSystem, Category = Safety) + /// + [pbr::OriginalName("AIR_FILTER_NOT_INSTALLED")] AirFilterNotInstalled = 191, + /// + ///Air filter clogged (Group = WasteHandlingSystem, Category = Error) + /// + [pbr::OriginalName("AIR_FILTER_CLOGGED")] AirFilterClogged = 192, + /// + ///Waste emptying failure (Group = WasteHandlingSystem, Category = Error) + /// + [pbr::OriginalName("WASTE_CONTAINER_EMPTYING_TIMEOUT")] WasteContainerEmptyingTimeout = 193, + /// + ///No air pressure (Group = WasteHandlingSystem, Category = Safety) + /// + [pbr::OriginalName("NO_AIR_PRESSURE")] NoAirPressure = 194, + /// + ///Overflow in waste container (Group = WasteHandlingSystem, Category = Error) + /// + [pbr::OriginalName("WASTE_CONTAINER_OVERFLOW")] WasteContainerOverflow = 195, + /// + /// (Group = WasteHandlingSystem, Category = Error) + /// + [pbr::OriginalName("VOC_SENSOR_ALARM")] VocSensorAlarm = 196, + /// + ///Chiller malfunction (Group = WasteHandlingSystem, Category = Error) + /// + [pbr::OriginalName("CHILLER_DRY_CONTACT")] ChillerDryContact = 197, + /// + ///Insufficient air flow (Group = WasteHandlingSystem, Category = Error) + /// + [pbr::OriginalName("INSUFFICIENT_AIR_FLOW")] InsufficientAirFlow = 198, + /// + ///Ink cartridge presence failure (Group = InkFillingSystem, Category = Error) + /// + [pbr::OriginalName("INK_CARTRIDGE_PRESENCE_SENSOR_TIMEOUT")] InkCartridgePresenceSensorTimeout = 199, + /// + ///Ink cartridge identification failure (Group = InkFillingSystem, Category = Error) + /// + [pbr::OriginalName("INK_CARTRIDGE_RFID_TIMEOUT")] InkCartridgeRfidTimeout = 200, + /// + ///No waste cartridge available (Group = InkFillingSystem, Category = Error) + /// + [pbr::OriginalName("NO_WASTE_CARTRIDGE_AVAILABLE")] NoWasteCartridgeAvailable = 201, + /// + ///All waste cartridges are full (Group = InkFillingSystem, Category = Error) + /// + [pbr::OriginalName("ALL_WASTE_CARTRIDGES_FULL")] AllWasteCartridgesFull = 202, + /// + ///Waste cartridge presence failure (Group = InkFillingSystem, Category = Error) + /// + [pbr::OriginalName("WASTE_CARTRIDGE_PRESENCE_SENSOR_TIMEOUT")] WasteCartridgePresenceSensorTimeout = 203, + /// + ///Waste cartridge identification failure (Group = InkFillingSystem, Category = Error) + /// + [pbr::OriginalName("WASTE_CARTRIDGE_RFID_TIMEOUT")] WasteCartridgeRfidTimeout = 204, + /// + ///Electrical cabinet fans RPM too low (Group = ElectricalCabinet, Category = Warning) + /// + [pbr::OriginalName("ELECTRICAL_CABINET_FANS_RPM_TOO_LOW")] ElectricalCabinetFansRpmTooLow = 205, + /// + ///Electrical cabinet fans stopped (Group = ElectricalCabinet, Category = Error) + /// + [pbr::OriginalName("ELECTRICAL_CABINET_FANS_STOPPED")] ElectricalCabinetFansStopped = 206, + /// + ///Occurs a request has been sent to the machine or external bridge service (Group = Transport, Category = Info) + /// + [pbr::OriginalName("REQUEST_SENT")] RequestSent = 1000, + /// + ///Occures when a response has been received (Group = Transport, Category = Info) + /// + [pbr::OriginalName("RESPONSE_RECEIVED")] ResponseReceived = 1001, + /// + ///Occures when a request to the machine has failed (Group = Transport, Category = Error) + /// + [pbr::OriginalName("REQUEST_FAILED")] RequestFailed = 1002, + /// + ///Occures when the application has encountered some error (Group = Application, Category = Error) + /// + [pbr::OriginalName("APPLICATION_EXCEPTION")] ApplicationException = 1003, + /// + ///General application event logs (Group = Application, Category = Info) + /// + [pbr::OriginalName("APPLICATION_INFORMATION")] ApplicationInformation = 1004, + /// + ///Notifies about application succesfully started (Group = Application, Category = Info) + /// + [pbr::OriginalName("APPLICATION_STARTED")] ApplicationStarted = 1005, + /// + ///Notifies about application termination (Group = Application, Category = Info) + /// + [pbr::OriginalName("APPLICATION_TERMINATED")] ApplicationTerminated = 1006, + /// + ///Occures when a diagnostics recording has been started (Group = Application, Category = Info) + /// + [pbr::OriginalName("RECORDING_STARTED")] RecordingStarted = 1007, + /// + ///Occures when a diagnostics recording has been stopped (Group = Application, Category = Info) + /// + [pbr::OriginalName("RECORDING_STOPPED")] RecordingStopped = 1008, + /// + ///Occures when a job status message has been received from the embedded device (Group = Application, Category = Info) + /// + [pbr::OriginalName("JOB_STATUS")] JobStatus = 1009, } #endregion diff --git a/Software/Visual_Studio/Tango.UnitTesting/DAL_TST.cs b/Software/Visual_Studio/Tango.UnitTesting/DAL_TST.cs index 02862350f..994ef4172 100644 --- a/Software/Visual_Studio/Tango.UnitTesting/DAL_TST.cs +++ b/Software/Visual_Studio/Tango.UnitTesting/DAL_TST.cs @@ -65,7 +65,7 @@ namespace Tango.UnitTesting { using (ObservablesContext db = ObservablesContext.CreateDefault(@"D:\Development\Tango\Software\DB\Tango.db", DataSourceType.SQLite)) { - var actions = db.ActionTypes.ToList(); + var actions = db.EventTypes.ToList(); } } } diff --git a/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/ObservablesGenerator.cs b/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/ObservablesGenerator.cs index 2c58be781..51b619b46 100644 --- a/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/ObservablesGenerator.cs +++ b/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/ObservablesGenerator.cs @@ -203,7 +203,7 @@ namespace Tango.DBObservablesGenerator.CLI if (descriptionProp != null) { - field.Description = descriptionProp.GetValue(row).ToString(); + field.Description = descriptionProp.GetValue(row).ToStringSafe(); } else { @@ -218,7 +218,10 @@ namespace Tango.DBObservablesGenerator.CLI File.WriteAllText(Path.Combine(enumerationsPath, enumFile.Name + ".cs"), code); } } - catch { } + catch (Exception ex) + { + + } } } //Generate Enumerations... diff --git a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs index e85a3e2ad..418e52139 100644 --- a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs +++ b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs @@ -18,15 +18,21 @@ namespace Tango.EventsTypesGenerator { public String Code { get; set; } public String Name { get; set; } + public String Title { get; set; } public String Description { get; set; } + public String TechnicalDescription { get; set; } + public String Index { get; set; } public String Category { get; set; } public String Group { get; set; } public String UserInterventionRequired { get; set; } - public String Resolvable { get; set; } + public String ActionsUI { get; set; } + public String ActionsEmbedded { get; set; } + public String NotificationTime { get; set; } + public String Guidance { get; set; } public override string ToString() { - return String.Format("{0}, {1}, {2}, {3}, {4}, {5}, {6}", Code, Name, Description, Category, Group, UserInterventionRequired, Resolvable); + return this.ToJsonString(); } } @@ -35,23 +41,12 @@ namespace Tango.EventsTypesGenerator Console.WriteLine("Generating hardware event types..."); ExcelReader reader = new ExcelReader(PathHelper.GetStartupPath() + "\\Events.xlsx"); - var results = reader.GetDataByIndex("Events", 2); - - Console.WriteLine("Clearing all previous hardware events..."); + var results = reader.GetDataByIndex("ALARM EVENTS HANDLING", 2); using (ObservablesContext db = ObservablesContext.CreateDefault()) { - var eventTypes = db.EventTypes.Include(x => x.EventTypesCategory).Include(x => x.EventTypesGroup).ToList(); - - foreach (var evType in eventTypes) - { - EventTypesGroups group = (EventTypesGroups)evType.EventTypesGroup.Code; - - if (group != EventTypesGroups.Application && group != EventTypesGroups.Transport) - { - db.EventTypes.Remove(evType); - } - } + Console.WriteLine("Clearing all event types..."); + db.Database.ExecuteSqlCommand("DELETE FROM EVENT_TYPES"); Console.WriteLine("Inserting new events..."); @@ -62,11 +57,18 @@ namespace Tango.EventsTypesGenerator EventType newEvent = new EventType(); newEvent.Code = int.Parse(evType.Code); newEvent.Name = evType.Name; + newEvent.Title = evType.Title; newEvent.Description = evType.Description; - newEvent.EventTypesCategory = db.EventTypesCategories.SingleOrDefault(x => x.Name == evType.Category); - newEvent.EventTypesGroup = db.EventTypesGroups.SingleOrDefault(x => x.Name == evType.Group); - newEvent.RequiresUserIntervention = evType.UserInterventionRequired == "Yes" ? true : false; - newEvent.Resolvable = evType.Resolvable == "Yes" ? true : false; + newEvent.TechnicalDescription = evType.TechnicalDescription; + newEvent.ComponentIndex = evType.Index != null ? int.Parse(evType.Index) : 0; + newEvent.Category = (EventTypeCategories)Enum.Parse(typeof(EventTypeCategories), evType.Category.Replace(" ", ""), true); + newEvent.Group = (EventTypeGroups)Enum.Parse(typeof(EventTypeGroups), evType.Group.Replace(" ", ""), true); + newEvent.NotificationTime = (EventTypeNotificationTimes)Enum.Parse(typeof(EventTypeNotificationTimes), evType.NotificationTime.Replace(" ", ""), true); + + //TODO: Do this when Nadav fixes the excel. + //newEvent.Actions = evType.ActionsUI.Split('\n').Select(x => (EventTypeActions)Enum.Parse(typeof(EventTypeActions), x.Replace(" ", ""), true)).ToList(); + + newEvent.RequiresUserIntervention = evType.UserInterventionRequired == "Yes"; db.EventTypes.Add(newEvent); } diff --git a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs index 849dd5cde..b5442e72b 100644 --- a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs +++ b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs @@ -88,9 +88,9 @@ namespace Tango.PMRGenerator.CLI messageFile.Properties.Add(new ProtoProperty("HardwareMotorType", "HardwareMotorType")); - foreach (var prop in typeof(HardwareMotor).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive && x.Name != "Active")) + foreach (var prop in typeof(HardwareMotorBase).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive && x.Name != "Active")) { - messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription(prop))); + messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription(prop))); } String enumString = enumFile.GenerateCode(); @@ -127,9 +127,9 @@ namespace Tango.PMRGenerator.CLI messageFile.Properties.Add(new ProtoProperty("HardwareDancerType", "HardwareDancerType")); - foreach (var prop in typeof(HardwareDancer).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive && x.Name != "Active")) + foreach (var prop in typeof(HardwareDancerBase).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive && x.Name != "Active")) { - messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription(prop))); + messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription(prop))); } String enumString = enumFile.GenerateCode(); @@ -166,9 +166,9 @@ namespace Tango.PMRGenerator.CLI messageFile.Properties.Add(new ProtoProperty("HardwarePidControlType", "HardwarePidControlType")); - foreach (var prop in typeof(HardwarePidControl).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive && x.Name != "Active")) + foreach (var prop in typeof(HardwarePidControlBase).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive && x.Name != "Active")) { - messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription(prop))); + messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription(prop))); } String enumString = enumFile.GenerateCode(); @@ -206,19 +206,19 @@ namespace Tango.PMRGenerator.CLI messageFile.Properties.Add(new ProtoProperty("Index", "int32")); - foreach (var prop in typeof(DispenserType).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive)) + foreach (var prop in typeof(DispenserTypeBase).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive)) { if (prop.Name != "Name" && prop.Name != "Code") { - messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription(prop))); + messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription(prop))); } } - foreach (var prop in typeof(Dispenser).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive)) + foreach (var prop in typeof(DispenserBase).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive)) { if (prop.Name != nameof(Dispenser.IsInstalled)) { - messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription(prop))); + messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription(prop))); } } @@ -255,9 +255,9 @@ namespace Tango.PMRGenerator.CLI messageFile.Properties.Add(new ProtoProperty("HardwareWinderType", "HardwareWinderType")); - foreach (var prop in typeof(HardwareWinder).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive && x.Name != "Active")) + foreach (var prop in typeof(HardwareWinderBase).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive && x.Name != "Active")) { - messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription(prop))); + messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription(prop))); } String enumString = enumFile.GenerateCode(); @@ -293,9 +293,9 @@ namespace Tango.PMRGenerator.CLI messageFile.Properties.Add(new ProtoProperty("HardwareSpeedSensorType", "HardwareSpeedSensorType")); - foreach (var prop in typeof(HardwareSpeedSensor).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive && x.Name != "Active")) + foreach (var prop in typeof(HardwareSpeedSensorBase).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive && x.Name != "Active")) { - messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription(prop))); + messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription(prop))); } String enumString = enumFile.GenerateCode(); @@ -331,9 +331,9 @@ namespace Tango.PMRGenerator.CLI messageFile.Properties.Add(new ProtoProperty("HardwareBlowerType", "HardwareBlowerType")); - foreach (var prop in typeof(HardwareBlower).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive && x.Name != "Active")) + foreach (var prop in typeof(HardwareBlowerBase).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive && x.Name != "Active")) { - messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription(prop))); + messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription(prop))); } String enumString = enumFile.GenerateCode(); @@ -369,9 +369,9 @@ namespace Tango.PMRGenerator.CLI messageFile.Properties.Add(new ProtoProperty("HardwareBreakSensorType", "HardwareBreakSensorType")); - foreach (var prop in typeof(HardwareBreakSensor).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive && x.Name != "Active")) + foreach (var prop in typeof(HardwareBreakSensorBase).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive && x.Name != "Active")) { - messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription(prop))); + messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription(prop))); } String enumString = enumFile.GenerateCode(); @@ -534,7 +534,7 @@ namespace Tango.PMRGenerator.CLI messageFile.Properties.Add(new ProtoProperty("JobSpoolType", "JobSpoolType")); - foreach (var prop in typeof(SpoolType).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive)) + foreach (var prop in typeof(SpoolTypeBase).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive)) { if (prop.Name != "Name" && prop.Name != "Code") { @@ -542,7 +542,7 @@ namespace Tango.PMRGenerator.CLI } } - foreach (var prop in typeof(Spool).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive)) + foreach (var prop in typeof(SpoolBase).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive)) { messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType))); } @@ -561,9 +561,9 @@ namespace Tango.PMRGenerator.CLI messageFile.Name = "ProcessParameters"; messageFile.Package = "Tango.PMR.Printing"; - foreach (var prop in typeof(ProcessParametersTable).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive)) + foreach (var prop in typeof(ProcessParametersTableBase).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly).Where(x => x.PropertyType.IsPrimitive)) { - messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription(prop))); + messageFile.Properties.Add(new ProtoProperty(prop.Name, CoercePropertyType(prop.PropertyType), GetDbDescription(prop))); } String messageString = messageFile.GenerateCode(); @@ -704,12 +704,19 @@ namespace Tango.PMRGenerator.CLI enumFile.Name = "EventType"; enumFile.Package = "Tango.PMR.Diagnostics"; - foreach (var field in db.EventTypes.ToList().Where(x => x.Code < 1000).OrderBy(x => x.Code)) + enumFile.Fields.Add(new EnumerationField() + { + Name = "None", + Description = "Must contain a 0 value", + Value = 0, + }); + + foreach (var field in db.EventTypes.ToList().OrderBy(x => x.Code)) { enumFile.Fields.Add(new EnumerationField() { Name = field.Name.Replace(" ", ""), - Description = field.Description + String.Format(" (Group = {0}, Category = {1}, Actions = {2})", field.EventTypesGroup.Name, field.EventTypesCategory.Name, String.Join(", ", field.EventTypesActions.Select(x => x.ActionType.Name))), + Description = field.Description + String.Format(" (Group = {0}, Category = {1})", field.Group.ToString(), field.Category.ToString()), Value = field.Code, }); } -- cgit v1.3.1 From e2bf9f578c3ed53d869744f94b020048ca806c6e Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Tue, 8 Jan 2019 14:27:21 +0200 Subject: Refactored catalogs to per RML. Dropped MEDIA_COLOR. Added RML White Point LAB. Added additional dispenser parameters in MS module. Attempt to optimize PPC color catalog view performance. Removed "Color Catalog Code" from brush stop. Implemented PPC color catalog selection per RML. --- Software/DB/PPC/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/PPC/Tango_log.ldf | Bin 53673984 -> 53673984 bytes Software/DB/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/Tango_log.ldf | Bin 22675456 -> 22675456 bytes .../Views/DispenserView.xaml | 14 +- .../Views/DispensersView.xaml | 4 + .../Tango.MachineStudio.DB.csproj | 17 +- .../Tango.MachineStudio.DB/ViewModelLocator.cs | 9 - .../ViewModels/MediaColorsViewVM.cs | 17 -- .../Views/DBViews/MediaColorView.xaml | 38 ---- .../Views/DBViews/MediaColorView.xaml.cs | 28 --- .../Views/DBViews/MediaColorsView.xaml | 42 ---- .../Views/DBViews/MediaColorsView.xaml.cs | 32 --- .../ViewModels/MainViewVM.cs | 9 - .../Tango.MachineStudio.RML/Views/RmlView.xaml | 20 +- .../Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj | 2 +- .../Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs | 27 ++- .../ViewModels/TwineCatalogViewVM.cs | 2 +- .../Controls/TwineCatalogControl.xaml | 2 +- .../Controls/TwineCatalogControl.xaml.cs | 56 ++--- .../Visual_Studio/Tango.BL/Builders/RmlBuilder.cs | 1 - .../Tango.BL/Builders/RmlsCollectionBuilder.cs | 1 - .../Tango.BL/Catalogs/CatalogLoader.cs | 6 +- .../Tango.BL/Entities/BrushStopBase.cs | 38 ---- .../Tango.BL/Entities/ColorCatalogBase.cs | 63 ++++++ .../Visual_Studio/Tango.BL/Entities/MediaColor.cs | 45 ---- .../Tango.BL/Entities/MediaColorBase.cs | 226 --------------------- Software/Visual_Studio/Tango.BL/Entities/Rml.cs | 35 ++++ .../Visual_Studio/Tango.BL/Entities/RmlBase.cs | 197 +++++++++++++----- .../Visual_Studio/Tango.BL/ObservablesContext.cs | 8 - .../Tango.BL/ObservablesEntitiesAdapter.cs | 2 - .../ObservablesEntitiesAdapterExtension.cs | 38 ---- .../ObservablesStaticCollectionsExtension.cs | 38 ---- Software/Visual_Studio/Tango.BL/Tango.BL.csproj | 4 +- .../Tango.DAL.Remote/DB/BRUSH_STOPS.cs | 1 - .../Tango.DAL.Remote/DB/COLOR_CATALOGS.cs | 2 + .../Tango.DAL.Remote/DB/MEDIA_COLORS.cs | 34 ---- Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs | 8 +- .../Tango.DAL.Remote/DB/RemoteADO.Context.cs | 1 - .../Tango.DAL.Remote/DB/RemoteADO.edmx | 129 +++++------- .../Tango.DAL.Remote/DB/RemoteADO.edmx.diagram | 143 +++++++------ .../Tango.DAL.Remote/Tango.DAL.Remote.csproj | 5 +- 42 files changed, 455 insertions(+), 889 deletions(-) delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaColorsViewVM.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorView.xaml delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorView.xaml.cs delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorsView.xaml delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorsView.xaml.cs delete mode 100644 Software/Visual_Studio/Tango.BL/Entities/MediaColor.cs delete mode 100644 Software/Visual_Studio/Tango.BL/Entities/MediaColorBase.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Remote/DB/MEDIA_COLORS.cs (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels') diff --git a/Software/DB/PPC/Tango.mdf b/Software/DB/PPC/Tango.mdf index b12efe5cb..32108bc4a 100644 Binary files a/Software/DB/PPC/Tango.mdf and b/Software/DB/PPC/Tango.mdf differ diff --git a/Software/DB/PPC/Tango_log.ldf b/Software/DB/PPC/Tango_log.ldf index 20177ab88..1059a5b6c 100644 Binary files a/Software/DB/PPC/Tango_log.ldf and b/Software/DB/PPC/Tango_log.ldf differ diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf index 71429596e..2468d8559 100644 Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf index 72cdafc9f..de658cfa8 100644 Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ diff --git a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispenserView.xaml b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispenserView.xaml index d4b3b0655..0b295b620 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispenserView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispenserView.xaml @@ -54,7 +54,19 @@ Nanoliter / Pulse: - + + + Part Number: + + + PCB Serial: + + + PCB Version: + + + Production Date: + Installed On Machine: diff --git a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispensersView.xaml b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispensersView.xaml index a7a57d801..a1d080380 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispensersView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispensersView.xaml @@ -66,6 +66,10 @@ + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj index da427f4d8..b0749e196 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj @@ -109,7 +109,6 @@ - @@ -230,18 +229,12 @@ MediaMaterialsView.xaml - - MediaColorView.xaml - MediaPurposView.xaml MediaMaterialView.xaml - - MediaColorsView.xaml - IdsPacksView.xaml @@ -501,10 +494,6 @@ MSBuild:Compile Designer - - MSBuild:Compile - Designer - MSBuild:Compile Designer @@ -513,10 +502,6 @@ MSBuild:Compile Designer - - MSBuild:Compile - Designer - MSBuild:Compile Designer @@ -734,7 +719,7 @@ - + \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs index 736682e07..05c3ba0c7 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs @@ -41,7 +41,6 @@ namespace Tango.MachineStudio.DB TangoIOC.Default.Register(); TangoIOC.Default.Register(); - TangoIOC.Default.Register(); TangoIOC.Default.Register(); TangoIOC.Default.Register(); TangoIOC.Default.Register(); @@ -223,14 +222,6 @@ namespace Tango.MachineStudio.DB } } - public static MediaColorsViewVM MediaColorsViewVM - { - get - { - return TangoIOC.Default.GetInstance(); - } - } - public static MediaPurposesViewVM MediaPurposesViewVM { get diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaColorsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaColorsViewVM.cs deleted file mode 100644 index fd815e5df..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaColorsViewVM.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; -using Tango.MachineStudio.Common.Notifications; - -namespace Tango.MachineStudio.DB.ViewModels -{ - public class MediaColorsViewVM : DbTableViewModel - { - public MediaColorsViewVM(INotificationProvider notification) : base(notification) - { - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorView.xaml deleted file mode 100644 index 9fcfc5a89..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorView.xaml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorView.xaml.cs deleted file mode 100644 index de09b9aaf..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorView.xaml.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; - -namespace Tango.MachineStudio.DB.Views.DBViews -{ - /// - /// Interaction logic for MachineView.xaml - /// - public partial class MediaColorView : UserControl - { - public MediaColorView() - { - InitializeComponent(); - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorsView.xaml deleted file mode 100644 index 57adda44d..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorsView.xaml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorsView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorsView.xaml.cs deleted file mode 100644 index ceae18ec8..000000000 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorsView.xaml.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; -using Tango.MachineStudio.DB.CustomAttributes; -using Tango.MachineStudio.DB.Managers; -using Tango.SharedUI.Controls; - -namespace Tango.MachineStudio.DB.Views.DBViews -{ - /// - /// Interaction logic for MachinesView.xaml - /// - [DBView] - public partial class MediaColorsView : UserControl - { - public MediaColorsView() : base() - { - InitializeComponent(); - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs index f8966b729..57c1aa724 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs @@ -42,13 +42,6 @@ namespace Tango.MachineStudio.RML.ViewModels set { _materials = value; RaisePropertyChangedAuto(); } } - private ObservableCollection _colors; - public ObservableCollection Colors - { - get { return _colors; } - set { _colors = value; RaisePropertyChangedAuto(); } - } - private ObservableCollection _purposes; public ObservableCollection Purposes { @@ -265,7 +258,6 @@ namespace Tango.MachineStudio.RML.ViewModels private void LoadRmlProperties() { Materials = _active_context.MediaMaterials.ToObservableCollection(); - Colors = _active_context.MediaColors.ToObservableCollection(); Purposes = _active_context.MediaPurposes.ToObservableCollection(); Conditions = _active_context.MediaConditions.ToObservableCollection(); LinearMassDensityUnits = _active_context.LinearMassDensityUnits.ToObservableCollection(); @@ -303,7 +295,6 @@ namespace Tango.MachineStudio.RML.ViewModels rml.Manufacturer = "Twine"; rml.Code = Rmls.Max(x => x.Code) + 1; rml.MediaMaterial = Materials.FirstOrDefault(); - rml.MediaColor = Colors.FirstOrDefault(); rml.MediaPurpose = Purposes.FirstOrDefault(); rml.MediaCondition = Conditions.FirstOrDefault(); rml.LinearMassDensityUnit = LinearMassDensityUnits.FirstOrDefault(); diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml index d72b6c7d3..8f2c5d187 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml @@ -65,20 +65,12 @@ - - - - - - - - - - - - - - + + + + + + diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj index 6830f2ec5..b4b635b8f 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj @@ -394,7 +394,7 @@ - + \ No newline at end of file diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs index 6a05eee12..08600c928 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs @@ -333,7 +333,7 @@ namespace Tango.PPC.Jobs.ViewModels TwineCatalogAutoCompleteProvider = new AutoCompleteProvider((color, filter) => { - return !String.IsNullOrWhiteSpace(filter) && color.Name.ToLower().StartsWith(filter.ToLower()); + return !String.IsNullOrWhiteSpace(filter) && color.RmlGuid == Job.Rml.Guid && color.Name.ToLower().StartsWith(filter.ToLower()); }); //Initialize Commands @@ -410,6 +410,9 @@ namespace Tango.PPC.Jobs.ViewModels .WithBrushStops() .BuildAsync(); + Job.RmlChanged -= OnRmlChanged; + Job.RmlChanged += OnRmlChanged; + Job.ValidateOnPropertyChanged = true; LogManager.Log("Loading RMLS..."); @@ -420,7 +423,7 @@ namespace Tango.PPC.Jobs.ViewModels SpoolTypes = await _db.SpoolTypes.ToListAsync(); LogManager.Log("Loading Customers..."); Customers = await _db.Customers.Where(x => x.OrganizationGuid == MachineProvider.Machine.OrganizationGuid).ToListAsync(); - TwineCatalogItems = await _db.ColorCatalogs.Where(x => x.ColorSpace.Code == (int)BL.Enumerations.ColorSpaces.Twine).OrderBy(x => x.Name).ToListAsync(); + TwineCatalogItems = await _db.ColorCatalogs.Where(x => x.RmlGuid == Job.Rml.Guid && x.ColorSpace.Code == (int)BL.Enumerations.ColorSpaces.Twine).OrderBy(x => x.Name).ToListAsync(); if (!_check_gamut_thread.IsAlive) { @@ -470,6 +473,8 @@ namespace Tango.PPC.Jobs.ViewModels } } + + /// /// Saves the job. /// @@ -551,6 +556,22 @@ namespace Tango.PPC.Jobs.ViewModels #endregion + #region RML Changed + + protected virtual async void OnRmlChanged(object sender, Rml rml) + { + TwineCatalogItems = await _db.ColorCatalogs.Where(x => x.RmlGuid == rml.Guid && x.ColorSpace.Code == (int)BL.Enumerations.ColorSpaces.Twine).OrderBy(x => x.Name).ToListAsync(); + + //Replace all brush stops color catalogs. + foreach (var stop in Job.Segments.SelectMany(x => x.BrushStops).Where(x => x.ColorCatalog != null && x.BrushColorSpace == BL.Enumerations.ColorSpaces.Twine).ToList()) + { + var replacement = TwineCatalogItems.SingleOrDefault(x => x.Name == stop.ColorCatalog.Name); + stop.ColorCatalog = replacement; + } + } + + #endregion + #region Segments Management /// @@ -741,7 +762,7 @@ namespace Tango.PPC.Jobs.ViewModels if (catalogItem != null) { - stop.ColorCatalog = TwineCatalogItems.SingleOrDefault(x => x.Guid == catalogItem.Entity.Guid); + stop.ColorCatalog = TwineCatalogItems.SingleOrDefault(x => x.Name == catalogItem.Entity.Name); } } diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/TwineCatalogViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/TwineCatalogViewVM.cs index 6ed4afcd8..1fd5c8474 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/TwineCatalogViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/TwineCatalogViewVM.cs @@ -94,7 +94,7 @@ namespace Tango.PPC.Jobs.ViewModels /// private void Confirm() { - SettingsManager.Default.GetOrCreate().RecentTwineCatalogColors.Add(SelectedItem.Entity.Guid); + SettingsManager.Default.GetOrCreate().RecentTwineCatalogColors.Add(SelectedItem.Entity.Name); SettingsManager.Default.Save(); Recent = CatalogLoader.GetRecent(Catalog, SettingsManager.Default.GetOrCreate().RecentTwineCatalogColors); diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml b/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml index c1a7b29a2..fe483420a 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml @@ -13,7 +13,7 @@ - + diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml.cs index f786009f0..d4b924f17 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml.cs @@ -70,22 +70,22 @@ namespace Tango.PPC.Common.Controls /// The instance containing the event data. private void ScrollViewer_Scrolling(object sender, Touch.Controls.DoubleValueChangedEventArgs e) { - if (!_preventChange) - { - if (e.Value > _lastScrollPosition + 60 || e.Value < _lastScrollPosition - 60) - { - var group = list.ScrollViewer.GetMostVisibleElementDataContext(); + //if (!_preventChange) + //{ + // if (e.Value > _lastScrollPosition + 60 || e.Value < _lastScrollPosition - 60) + // { + // var group = list.ScrollViewer.GetMostVisibleElementDataContext(); - if (group != null) - { - _preventChange = true; - slider.Value = slider.Maximum - _catalog.Groups.IndexOf(group); - _preventChange = false; - } + // if (group != null) + // { + // _preventChange = true; + // slider.Value = slider.Maximum - _catalog.Groups.IndexOf(group); + // _preventChange = false; + // } - _lastScrollPosition = e.Value; - } - } + // _lastScrollPosition = e.Value; + // } + //} } /// @@ -113,22 +113,22 @@ namespace Tango.PPC.Common.Controls /// The instance containing the event data. private void TouchSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs e) { - if (_catalog == null || _catalog.Groups.Count == 0) return; + //if (_catalog == null || _catalog.Groups.Count == 0) return; - if (!_preventChange) - { - if (_catalog != null) - { - _preventChange = true; - list.ScrollToItem(_catalog.Groups.ElementAt(_catalog.Groups.Count - 1 - (int)e.NewValue)); - _preventChange = false; - } - } + //if (!_preventChange) + //{ + // if (_catalog != null) + // { + // _preventChange = true; + // list.ScrollToItem(_catalog.Groups.ElementAt(_catalog.Groups.Count - 1 - (int)e.NewValue)); + // _preventChange = false; + // } + //} - if (_catalog != null && _catalog.Groups.Count > _catalog.Groups.Count - 1 - (int)e.NewValue && _catalog.Groups.Count - 1 - (int)e.NewValue > -1) - { - slider.Foreground = new SolidColorBrush(_catalog.Groups.ElementAt(_catalog.Groups.Count - 1 - (int)e.NewValue).Color); - } + //if (_catalog != null && _catalog.Groups.Count > _catalog.Groups.Count - 1 - (int)e.NewValue && _catalog.Groups.Count - 1 - (int)e.NewValue > -1) + //{ + // slider.Foreground = new SolidColorBrush(_catalog.Groups.ElementAt(_catalog.Groups.Count - 1 - (int)e.NewValue).Color); + //} } /// diff --git a/Software/Visual_Studio/Tango.BL/Builders/RmlBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/RmlBuilder.cs index 7b5d9b7ff..dd40ceedc 100644 --- a/Software/Visual_Studio/Tango.BL/Builders/RmlBuilder.cs +++ b/Software/Visual_Studio/Tango.BL/Builders/RmlBuilder.cs @@ -20,7 +20,6 @@ namespace Tango.BL.Builders { return query. Include(x => x.MediaMaterial). - Include(x => x.MediaColor). Include(x => x.MediaPurpose). Include(x => x.MediaCondition). Include(x => x.LinearMassDensityUnit). diff --git a/Software/Visual_Studio/Tango.BL/Builders/RmlsCollectionBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/RmlsCollectionBuilder.cs index d6eabbae4..fa0056259 100644 --- a/Software/Visual_Studio/Tango.BL/Builders/RmlsCollectionBuilder.cs +++ b/Software/Visual_Studio/Tango.BL/Builders/RmlsCollectionBuilder.cs @@ -79,7 +79,6 @@ namespace Tango.BL.Builders return AddStep(6, () => { Context.MediaMaterials.ToList(); - Context.MediaColors.ToList(); Context.MediaPurposes.ToList(); Context.MediaConditions.ToList(); Context.LinearMassDensityUnits.ToList(); diff --git a/Software/Visual_Studio/Tango.BL/Catalogs/CatalogLoader.cs b/Software/Visual_Studio/Tango.BL/Catalogs/CatalogLoader.cs index ac2a00ab4..1522d0900 100644 --- a/Software/Visual_Studio/Tango.BL/Catalogs/CatalogLoader.cs +++ b/Software/Visual_Studio/Tango.BL/Catalogs/CatalogLoader.cs @@ -13,6 +13,8 @@ namespace Tango.BL.Catalogs { var all_items = context.ColorCatalogs.Where(x => x.ColorSpace.Code == (int)colorSpace).ToList(); + all_items = all_items.DistinctBy(x => x.Name).ToList(); + var first = all_items.First(); Catalog catalog = new Catalog(); @@ -35,9 +37,9 @@ namespace Tango.BL.Catalogs return catalog; } - public static Catalog GetRecent(Catalog source, List guids) + public static Catalog GetRecent(Catalog source, List names) { - var filtersItems = source.Groups.SelectMany(x => x.Items).Select(x => x.Entity).Where(x => guids.Contains(x.Guid)).ToList(); + var filtersItems = source.Groups.SelectMany(x => x.Items).Select(x => x.Entity).Where(x => names.Contains(x.Name)).ToList(); var first = filtersItems.FirstOrDefault(); diff --git a/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs b/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs index 53eee50e0..69658bab6 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs @@ -83,8 +83,6 @@ namespace Tango.BL.Entities public event EventHandler CorrectedChanged; - public event EventHandler ColorCatalogCodeChanged; - public event EventHandler ColorCatalogChanged; public event EventHandler ColorSpaceChanged; @@ -949,33 +947,6 @@ namespace Tango.BL.Entities } } - protected Int32 _colorcatalogcode; - - /// - /// Gets or sets the brushstopbase color catalog code. - /// - - [Column("COLOR_CATALOG_CODE")] - - public Int32 ColorCatalogCode - { - get - { - return _colorcatalogcode; - } - - set - { - if (_colorcatalogcode != value) - { - _colorcatalogcode = value; - - OnColorCatalogCodeChanged(value); - - } - } - } - protected ColorCatalog _colorcatalog; /// @@ -1318,15 +1289,6 @@ namespace Tango.BL.Entities RaisePropertyChanged(nameof(Corrected)); } - /// - /// Called when the ColorCatalogCode has changed. - /// - protected virtual void OnColorCatalogCodeChanged(Int32 colorcatalogcode) - { - ColorCatalogCodeChanged?.Invoke(this, colorcatalogcode); - RaisePropertyChanged(nameof(ColorCatalogCode)); - } - /// /// Called when the ColorCatalog has changed. /// diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogBase.cs index 49e519455..6438c6332 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogBase.cs @@ -57,6 +57,33 @@ namespace Tango.BL.Entities public event EventHandler ColorSpaceChanged; + public event EventHandler RmlChanged; + + protected String _rmlguid; + + /// + /// Gets or sets the colorcatalogbase rml guid. + /// + + [Column("RML_GUID")] + [ForeignKey("Rml")] + + public String RmlGuid + { + get + { + return _rmlguid; + } + + set + { + if (_rmlguid != value) + { + _rmlguid = value; + } + } + } + protected String _colorspaceguid; /// @@ -512,6 +539,33 @@ namespace Tango.BL.Entities } } + protected Rml _rml; + + /// + /// Gets or sets the colorcatalogbase rml. + /// + + [XmlIgnore] + [JsonIgnore] + public virtual Rml Rml + { + get + { + return _rml; + } + + set + { + if (_rml != value) + { + _rml = value; + + OnRmlChanged(value); + + } + } + } + /// /// Called when the ColorCode has changed. /// @@ -656,6 +710,15 @@ namespace Tango.BL.Entities RaisePropertyChanged(nameof(ColorSpace)); } + /// + /// Called when the Rml has changed. + /// + protected virtual void OnRmlChanged(Rml rml) + { + RmlChanged?.Invoke(this, rml); + RaisePropertyChanged(nameof(Rml)); + } + /// /// Initializes a new instance of the class. /// diff --git a/Software/Visual_Studio/Tango.BL/Entities/MediaColor.cs b/Software/Visual_Studio/Tango.BL/Entities/MediaColor.cs deleted file mode 100644 index b9020406b..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/MediaColor.cs +++ /dev/null @@ -1,45 +0,0 @@ -using ColorMine.ColorSpaces; -using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Media; - -namespace Tango.BL.Entities -{ - public partial class MediaColor : MediaColorBase - { - [NotMapped] - [JsonIgnore] - public Color Color - { - get - { - Lab lab = new Lab(L, A, B); - var rgb = lab.To(); - return Color.FromRgb((byte)rgb.R, (byte)rgb.G, (byte)rgb.B); - } - } - - protected override void RaisePropertyChanged(string propName) - { - base.RaisePropertyChanged(propName); - - if (propName == nameof(L) || propName == nameof(A) || propName == nameof(B)) - { - RaisePropertyChanged(nameof(Color)); - } - } - - /// - /// Initializes a new instance of the class. - /// - public MediaColor() : base() - { - - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/MediaColorBase.cs b/Software/Visual_Studio/Tango.BL/Entities/MediaColorBase.cs deleted file mode 100644 index 529441857..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/MediaColorBase.cs +++ /dev/null @@ -1,226 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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! -// -//------------------------------------------------------------------------------ - -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; - -namespace Tango.BL.Entities -{ - [Table("MEDIA_COLORS")] - public abstract class MediaColorBase : ObservableEntity - { - - public event EventHandler NameChanged; - - public event EventHandler LChanged; - - public event EventHandler AChanged; - - public event EventHandler BChanged; - - public event EventHandler> RmlsChanged; - - protected String _name; - - /// - /// Gets or sets the mediacolorbase name. - /// - - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - if (_name != value) - { - _name = value; - - OnNameChanged(value); - - } - } - } - - protected Double _l; - - /// - /// Gets or sets the mediacolorbase l. - /// - - [Column("L")] - - public Double L - { - get - { - return _l; - } - - set - { - if (_l != value) - { - _l = value; - - OnLChanged(value); - - } - } - } - - protected Double _a; - - /// - /// Gets or sets the mediacolorbase a. - /// - - [Column("A")] - - public Double A - { - get - { - return _a; - } - - set - { - if (_a != value) - { - _a = value; - - OnAChanged(value); - - } - } - } - - protected Double _b; - - /// - /// Gets or sets the mediacolorbase b. - /// - - [Column("B")] - - public Double B - { - get - { - return _b; - } - - set - { - if (_b != value) - { - _b = value; - - OnBChanged(value); - - } - } - } - - protected SynchronizedObservableCollection _rmls; - - /// - /// Gets or sets the mediacolorbase rmls. - /// - - public virtual SynchronizedObservableCollection Rmls - { - get - { - return _rmls; - } - - set - { - if (_rmls != value) - { - _rmls = value; - - OnRmlsChanged(value); - - } - } - } - - /// - /// Called when the Name has changed. - /// - protected virtual void OnNameChanged(String name) - { - NameChanged?.Invoke(this, name); - RaisePropertyChanged(nameof(Name)); - } - - /// - /// Called when the L has changed. - /// - protected virtual void OnLChanged(Double l) - { - LChanged?.Invoke(this, l); - RaisePropertyChanged(nameof(L)); - } - - /// - /// Called when the A has changed. - /// - protected virtual void OnAChanged(Double a) - { - AChanged?.Invoke(this, a); - RaisePropertyChanged(nameof(A)); - } - - /// - /// Called when the B has changed. - /// - protected virtual void OnBChanged(Double b) - { - BChanged?.Invoke(this, b); - RaisePropertyChanged(nameof(B)); - } - - /// - /// Called when the Rmls has changed. - /// - protected virtual void OnRmlsChanged(SynchronizedObservableCollection rmls) - { - RmlsChanged?.Invoke(this, rmls); - RaisePropertyChanged(nameof(Rmls)); - } - - /// - /// Initializes a new instance of the class. - /// - public MediaColorBase() : base() - { - - Rmls = new SynchronizedObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/Rml.cs b/Software/Visual_Studio/Tango.BL/Entities/Rml.cs index c75c5bf99..f79fb6c5b 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/Rml.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/Rml.cs @@ -1,8 +1,10 @@ +using ColorMine.ColorSpaces; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Windows.Media; namespace Tango.BL.Entities { @@ -15,5 +17,38 @@ namespace Tango.BL.Entities { } + + protected override void OnWhitePointLChanged(double whitepointl) + { + base.OnWhitePointLChanged(whitepointl); + UpdateColor(); + } + + protected override void OnWhitePointAChanged(double whitepointa) + { + base.OnWhitePointAChanged(whitepointa); + UpdateColor(); + } + + protected override void OnWhitePointBChanged(double whitepointb) + { + base.OnWhitePointBChanged(whitepointb); + UpdateColor(); + } + + private void UpdateColor() + { + RaisePropertyChanged(nameof(Color)); + } + + public Color Color + { + get + { + Lab lab = new Lab(WhitePointA, WhitePointA, WhitePointB); + Rgb rgb = lab.To(); + return Color.FromRgb((byte)rgb.R, (byte)rgb.G, (byte)rgb.B); + } + } } } diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs index 2b85ca767..97fee9558 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs @@ -31,6 +31,12 @@ namespace Tango.BL.Entities public event EventHandler CodeChanged; + public event EventHandler WhitePointLChanged; + + public event EventHandler WhitePointAChanged; + + public event EventHandler WhitePointBChanged; + public event EventHandler FiberSizeChanged; public event EventHandler NumberOfFibersChanged; @@ -59,6 +65,8 @@ namespace Tango.BL.Entities public event EventHandler> CctsChanged; + public event EventHandler> ColorCatalogsChanged; + public event EventHandler FiberShapeChanged; public event EventHandler FiberSynthChanged; @@ -71,8 +79,6 @@ namespace Tango.BL.Entities public event EventHandler> MachinesChanged; - public event EventHandler MediaColorChanged; - public event EventHandler MediaConditionChanged; public event EventHandler MediaMaterialChanged; @@ -162,52 +168,108 @@ namespace Tango.BL.Entities } } - protected String _mediamaterialguid; + protected Double _whitepointl; /// - /// Gets or sets the rmlbase media material guid. + /// Gets or sets the rmlbase white point l. /// - [Column("MEDIA_MATERIAL_GUID")] - [ForeignKey("MediaMaterial")] + [Column("WHITE_POINT_L")] - public String MediaMaterialGuid + public Double WhitePointL { get { - return _mediamaterialguid; + return _whitepointl; } set { - if (_mediamaterialguid != value) + if (_whitepointl != value) { - _mediamaterialguid = value; + _whitepointl = value; + + OnWhitePointLChanged(value); + } } } - protected String _mediacolorguid; + protected Double _whitepointa; /// - /// Gets or sets the rmlbase media color guid. + /// Gets or sets the rmlbase white point a. /// - [Column("MEDIA_COLOR_GUID")] - [ForeignKey("MediaColor")] + [Column("WHITE_POINT_A")] - public String MediaColorGuid + public Double WhitePointA { get { - return _mediacolorguid; + return _whitepointa; } set { - if (_mediacolorguid != value) + if (_whitepointa != value) { - _mediacolorguid = value; + _whitepointa = value; + + OnWhitePointAChanged(value); + + } + } + } + + protected Double _whitepointb; + + /// + /// Gets or sets the rmlbase white point b. + /// + + [Column("WHITE_POINT_B")] + + public Double WhitePointB + { + get + { + return _whitepointb; + } + + set + { + if (_whitepointb != value) + { + _whitepointb = value; + + OnWhitePointBChanged(value); + + } + } + } + + protected String _mediamaterialguid; + + /// + /// Gets or sets the rmlbase media material guid. + /// + + [Column("MEDIA_MATERIAL_GUID")] + [ForeignKey("MediaMaterial")] + + public String MediaMaterialGuid + { + get + { + return _mediamaterialguid; + } + + set + { + if (_mediamaterialguid != value) + { + _mediamaterialguid = value; } } } @@ -711,6 +773,31 @@ namespace Tango.BL.Entities } } + protected SynchronizedObservableCollection _colorcatalogs; + + /// + /// Gets or sets the rmlbase color catalogs. + /// + + public virtual SynchronizedObservableCollection ColorCatalogs + { + get + { + return _colorcatalogs; + } + + set + { + if (_colorcatalogs != value) + { + _colorcatalogs = value; + + OnColorCatalogsChanged(value); + + } + } + } + protected FiberShape _fibershape; /// @@ -867,33 +954,6 @@ namespace Tango.BL.Entities } } - protected MediaColor _mediacolor; - - /// - /// Gets or sets the rmlbase media colors. - /// - - [XmlIgnore] - [JsonIgnore] - public virtual MediaColor MediaColor - { - get - { - return _mediacolor; - } - - set - { - if (_mediacolor != value) - { - _mediacolor = value; - - OnMediaColorChanged(value); - - } - } - } - protected MediaCondition _mediacondition; /// @@ -1027,6 +1087,33 @@ namespace Tango.BL.Entities RaisePropertyChanged(nameof(Code)); } + /// + /// Called when the WhitePointL has changed. + /// + protected virtual void OnWhitePointLChanged(Double whitepointl) + { + WhitePointLChanged?.Invoke(this, whitepointl); + RaisePropertyChanged(nameof(WhitePointL)); + } + + /// + /// Called when the WhitePointA has changed. + /// + protected virtual void OnWhitePointAChanged(Double whitepointa) + { + WhitePointAChanged?.Invoke(this, whitepointa); + RaisePropertyChanged(nameof(WhitePointA)); + } + + /// + /// Called when the WhitePointB has changed. + /// + protected virtual void OnWhitePointBChanged(Double whitepointb) + { + WhitePointBChanged?.Invoke(this, whitepointb); + RaisePropertyChanged(nameof(WhitePointB)); + } + /// /// Called when the FiberSize has changed. /// @@ -1153,6 +1240,15 @@ namespace Tango.BL.Entities RaisePropertyChanged(nameof(Ccts)); } + /// + /// Called when the ColorCatalogs has changed. + /// + protected virtual void OnColorCatalogsChanged(SynchronizedObservableCollection colorcatalogs) + { + ColorCatalogsChanged?.Invoke(this, colorcatalogs); + RaisePropertyChanged(nameof(ColorCatalogs)); + } + /// /// Called when the FiberShape has changed. /// @@ -1207,15 +1303,6 @@ namespace Tango.BL.Entities RaisePropertyChanged(nameof(Machines)); } - /// - /// Called when the MediaColor has changed. - /// - protected virtual void OnMediaColorChanged(MediaColor mediacolor) - { - MediaColorChanged?.Invoke(this, mediacolor); - RaisePropertyChanged(nameof(MediaColor)); - } - /// /// Called when the MediaCondition has changed. /// @@ -1262,6 +1349,8 @@ namespace Tango.BL.Entities Ccts = new SynchronizedObservableCollection(); + ColorCatalogs = new SynchronizedObservableCollection(); + Jobs = new SynchronizedObservableCollection(); LiquidTypesRmls = new SynchronizedObservableCollection(); diff --git a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs index 27e4ee6a7..0ca9e8b34 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs @@ -390,14 +390,6 @@ namespace Tango.BL get; set; } - /// - /// Gets or sets the MediaColors. - /// - public DbSet MediaColors - { - get; set; - } - /// /// Gets or sets the MediaConditions. /// diff --git a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapter.cs b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapter.cs index 947d27565..1cbd91835 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapter.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapter.cs @@ -178,8 +178,6 @@ namespace Tango.BL MediaMaterials = Context.MediaMaterials.ToObservableCollection(); - MediaColors = Context.MediaColors.ToObservableCollection(); - MediaPurposes = Context.MediaPurposes.ToObservableCollection(); MediaConditions = Context.MediaConditions.ToObservableCollection(); diff --git a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs index 57f01105e..5d087b245 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs @@ -1673,42 +1673,6 @@ namespace Tango.BL } - private ObservableCollection _mediacolors; - /// - /// Gets or sets the MediaColors. - /// - public ObservableCollection MediaColors - { - get - { - return _mediacolors; - } - - set - { - _mediacolors = value; RaisePropertyChanged(nameof(MediaColors)); - } - - } - - private ICollectionView _mediacolorsViewSource; - /// - /// Gets or sets the MediaColors View Source. - /// - public ICollectionView MediaColorsViewSource - { - get - { - return _mediacolorsViewSource; - } - - set - { - _mediacolorsViewSource = value; RaisePropertyChanged(nameof(MediaColorsViewSource)); - } - - } - private ObservableCollection _mediaconditions; /// /// Gets or sets the MediaConditions. @@ -2707,8 +2671,6 @@ namespace Tango.BL MachinesEventsViewSource = CreateCollectionView(MachinesEvents); - MediaColorsViewSource = CreateCollectionView(MediaColors); - MediaConditionsViewSource = CreateCollectionView(MediaConditions); MediaMaterialsViewSource = CreateCollectionView(MediaMaterials); diff --git a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs index 096cd2687..d97e9d075 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs @@ -1673,42 +1673,6 @@ namespace Tango.BL } - private ObservableCollection _mediacolors; - /// - /// Gets or sets the MediaColors. - /// - public ObservableCollection MediaColors - { - get - { - return _mediacolors; - } - - set - { - _mediacolors = value; RaisePropertyChanged(nameof(MediaColors)); - } - - } - - private ICollectionView _mediacolorsViewSource; - /// - /// Gets or sets the MediaColors View Source. - /// - public ICollectionView MediaColorsViewSource - { - get - { - return _mediacolorsViewSource; - } - - set - { - _mediacolorsViewSource = value; RaisePropertyChanged(nameof(MediaColorsViewSource)); - } - - } - private ObservableCollection _mediaconditions; /// /// Gets or sets the MediaConditions. @@ -2707,8 +2671,6 @@ namespace Tango.BL MachinesEventsViewSource = CreateCollectionView(MachinesEvents); - MediaColorsViewSource = CreateCollectionView(MediaColors); - MediaConditionsViewSource = CreateCollectionView(MediaConditions); MediaMaterialsViewSource = CreateCollectionView(MediaMaterials); diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj index dd5122ec2..08e005ff0 100644 --- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj +++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj @@ -163,7 +163,6 @@ - @@ -275,7 +274,6 @@ - @@ -404,7 +402,7 @@ - + \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/BRUSH_STOPS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/BRUSH_STOPS.cs index 6c1ff459c..d06c0f5ad 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/BRUSH_STOPS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/BRUSH_STOPS.cs @@ -49,7 +49,6 @@ namespace Tango.DAL.Remote.DB public int V7_DIV { get; set; } public bool CORRECTED { get; set; } public string COLOR_CATALOG_GUID { get; set; } - public int COLOR_CATALOG_CODE { get; set; } public virtual COLOR_CATALOGS COLOR_CATALOGS { get; set; } public virtual COLOR_SPACES COLOR_SPACES { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS.cs index 8526e3d8d..1a416d792 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS.cs @@ -23,6 +23,7 @@ namespace Tango.DAL.Remote.DB public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } + public string RML_GUID { get; set; } public string COLOR_SPACE_GUID { get; set; } public int COLOR_CODE { get; set; } public string NAME { get; set; } @@ -42,5 +43,6 @@ namespace Tango.DAL.Remote.DB [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection BRUSH_STOPS { get; set; } public virtual COLOR_SPACES COLOR_SPACES { get; set; } + public virtual RML RML { get; set; } } } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/MEDIA_COLORS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/MEDIA_COLORS.cs deleted file mode 100644 index 4e7672b2e..000000000 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/MEDIA_COLORS.cs +++ /dev/null @@ -1,34 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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. -// -//------------------------------------------------------------------------------ - -namespace Tango.DAL.Remote.DB -{ - using System; - using System.Collections.Generic; - - public partial class MEDIA_COLORS - { - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] - public MEDIA_COLORS() - { - this.RMLS = new HashSet(); - } - - public int ID { get; set; } - public string GUID { get; set; } - public System.DateTime LAST_UPDATED { get; set; } - public string NAME { get; set; } - public double L { get; set; } - public double A { get; set; } - public double B { get; set; } - - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection RMLS { 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 5b4ca71ff..539978519 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs @@ -19,6 +19,7 @@ namespace Tango.DAL.Remote.DB { this.CATS = new HashSet(); this.CCTS = new HashSet(); + this.COLOR_CATALOGS = new HashSet(); this.JOBS = new HashSet(); this.LIQUID_TYPES_RMLS = new HashSet(); this.MACHINES = new HashSet(); @@ -31,8 +32,10 @@ namespace Tango.DAL.Remote.DB public string NAME { get; set; } public string MANUFACTURER { get; set; } public int CODE { get; set; } + public double WHITE_POINT_L { get; set; } + public double WHITE_POINT_A { get; set; } + public double WHITE_POINT_B { get; set; } public string MEDIA_MATERIAL_GUID { get; set; } - public string MEDIA_COLOR_GUID { get; set; } public string MEDIA_PURPOSE_GUID { get; set; } public string MEDIA_CONDITION_GUID { get; set; } public string LINEAR_MASS_DENSITY_UNIT_GUID { get; set; } @@ -55,6 +58,8 @@ namespace Tango.DAL.Remote.DB public virtual ICollection CATS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection CCTS { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection COLOR_CATALOGS { get; set; } public virtual FIBER_SHAPES FIBER_SHAPES { get; set; } public virtual FIBER_SYNTHS FIBER_SYNTHS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] @@ -64,7 +69,6 @@ namespace Tango.DAL.Remote.DB public virtual ICollection LIQUID_TYPES_RMLS { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection MACHINES { get; set; } - public virtual MEDIA_COLORS MEDIA_COLORS { get; set; } public virtual MEDIA_CONDITIONS MEDIA_CONDITIONS { get; set; } public virtual MEDIA_MATERIALS MEDIA_MATERIALS { get; set; } public virtual MEDIA_PURPOSES MEDIA_PURPOSES { 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 c103a6bba..98c4a65ae 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs @@ -71,7 +71,6 @@ namespace Tango.DAL.Remote.DB public virtual DbSet MACHINE_VERSIONS { get; set; } public virtual DbSet MACHINES { get; set; } public virtual DbSet MACHINES_EVENTS { get; set; } - public virtual DbSet MEDIA_COLORS { get; set; } public virtual DbSet MEDIA_CONDITIONS { get; set; } public virtual DbSet MEDIA_MATERIALS { get; set; } public virtual DbSet MEDIA_PURPOSES { 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 2ac5ff6b7..028494b1e 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx @@ -90,7 +90,6 @@ - @@ -138,6 +137,7 @@ + @@ -692,18 +692,6 @@ - - - - - - - - - - - - @@ -819,8 +807,10 @@ + + + - @@ -1160,6 +1150,20 @@ + + + + + + + + + + + + + + @@ -1856,18 +1860,6 @@ - - - - - - - - - - - - @@ -2110,7 +2102,6 @@ - @@ -2169,6 +2160,10 @@ + + + + @@ -2385,10 +2380,6 @@ - - - - @@ -2501,7 +2492,6 @@ - @@ -2583,6 +2573,10 @@ + + + + @@ -2787,10 +2781,6 @@ - - - - @@ -2938,7 +2928,6 @@ - @@ -2994,6 +2983,7 @@ + @@ -3011,6 +3001,7 @@ + @@ -3640,19 +3631,6 @@ - - - - - - - - - - - - - @@ -3781,8 +3759,10 @@ + + + - @@ -3802,13 +3782,13 @@ + - @@ -4227,6 +4207,20 @@ + + + + + + + + + + + + + + @@ -4887,18 +4881,6 @@ - - - - - - - - - - - - @@ -5123,7 +5105,6 @@ - @@ -5222,6 +5203,7 @@ + @@ -5802,19 +5784,6 @@ - - - - - - - - - - - - - @@ -5948,8 +5917,10 @@ - + + + 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 7c45c1dda..4a1ed5d8d 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram @@ -5,77 +5,76 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -90,6 +89,7 @@ + @@ -141,7 +141,6 @@ - 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 6938b6eca..508d9793e 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj +++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj @@ -201,9 +201,6 @@ RemoteADO.tt - - RemoteADO.tt - RemoteADO.tt @@ -347,7 +344,7 @@ - + \ No newline at end of file -- cgit v1.3.1