From e952c7c3e5c4441b60dc0b2dc1641459a35731e3 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Sun, 14 Jan 2018 17:09:24 +0200 Subject: Added code comments for: MachineStudio.MachineDesigner. --- .../AutoComplete/MachinesProvider.cs | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/AutoComplete') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/AutoComplete/MachinesProvider.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/AutoComplete/MachinesProvider.cs index 943c52f81..7a97db2e2 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/AutoComplete/MachinesProvider.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/AutoComplete/MachinesProvider.cs @@ -9,8 +9,17 @@ using Tango.DAL.Observables; namespace Tango.MachineStudio.MachineDesigner.AutoComplete { + /// + /// Represents an auto-complete Machines provider. + /// + /// public class MachinesProvider : ISuggestionProvider { + /// + /// Gets the suggestions. + /// + /// The filter. + /// public IEnumerable GetSuggestions(string filter) { return ObservablesEntitiesAdapter.Instance.Machines.Where(x => x.SerialNumber.StartsWith(filter, StringComparison.CurrentCultureIgnoreCase)).ToList(); -- cgit v1.3.1 From 5e68543fd93e441e1e76acc3f439594f66c4412a Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Thu, 18 Jan 2018 16:20:02 +0200 Subject: Removed Deleted from most of DB Tables !!!!!!!!!!! --- Software/Android_Studio/Tango.DAL/build.gradle | 2 +- .../src/main/java/com/twine/tango/dal/Entity.java | 23 - .../java/com/twine/tango/dal/dao/TangoDAO.java | 43 +- .../java/com/twine/tango/dal/entities/Address.java | 26 + .../java/com/twine/tango/dal/entities/Cat.java | 94 ++ .../java/com/twine/tango/dal/entities/Cct.java | 224 +++ .../twine/tango/dal/entities/Configuration.java | 140 +- .../java/com/twine/tango/dal/entities/Contact.java | 26 + .../twine/tango/dal/entities/DispenserType.java | 52 + .../twine/tango/dal/entities/EventTypesAction.java | 40 +- .../java/com/twine/tango/dal/entities/IdsPack.java | 112 +- .../twine/tango/dal/entities/LiquidTypesRml.java | 46 +- .../java/com/twine/tango/dal/entities/Machine.java | 20 +- .../twine/tango/dal/entities/MachinesEvent.java | 20 +- .../com/twine/tango/dal/entities/MidTankType.java | 94 ++ .../java/com/twine/tango/dal/entities/Rml.java | 186 +-- .../java/com/twine/tango/dal/entities/User.java | 26 + .../com/twine/tango/dal/entities/UsersRole.java | 26 + .../twine/tango/dal/enumerations/FiberShapes.java | 4 + .../twine/tango/dal/enumerations/FiberSynths.java | 4 + .../dal/enumerations/LinearMassDensityUnits.java | 4 + .../twine/tango/dal/enumerations/LiquidTypes.java | 15 + .../tango/dal/enumerations/MediaConditions.java | 4 + .../tango/dal/enumerations/MediaMaterials.java | 4 + .../tango/dal/enumerations/MediaPurposes.java | 4 + .../twine/tango/dal/enumerations/MidTankTypes.java | 19 + .../twine/tango/dal/enumerations/Permissions.java | 3 + .../Tango.DAL/src/main/res/raw/tangodb | Bin 602112 -> 602112 bytes .../tango/pmr/common/MessageTypeOuterClass.java | 41 +- .../StartDiagnosticsRequestOuterClass.java | 635 +++++++++ .../StartDiagnosticsResponseOuterClass.java | 782 ++++++++++ .../java/com/twine/tango/pmr/jobs/Dispenser.java | 1406 ++++++++++++++++++ .../com/twine/tango/pmr/jobs/JobOuterClass.java | 999 ++++++++++++- .../main/java/com/twine/tango/pmr/jobs/Motor.java | 1500 ++++++++++++++++++++ .../twine/tango/pmr/jobs/SegmentOuterClass.java | 384 ++++- .../Tango.PMR/src/main/res/raw/packages.txt | 1 + Software/DB/Tango.db | Bin 602112 -> 602112 bytes Software/DB/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/Tango_log.ldf | Bin 8388608 -> 8388608 bytes .../EventTypeActionsToStringConverter.cs | 2 +- .../Converters/LiquidTypeRmlsToStringConverter.cs | 2 +- .../RolesPermissionsToStringConverter.cs | 2 +- .../ViewModels/DbTableViewModel.cs | 15 +- .../ViewModels/EventTypesViewVM.cs | 27 +- .../ViewModels/LiquidTypesViewVM.cs | 25 +- .../ViewModels/RolesViewVM.cs | 25 +- .../Views/DBViews/IdsPackView.xaml | 6 +- .../Views/DBViews/IdsPacksView.xaml | 4 +- .../AutoComplete/MachineVersionsProvider.cs | 26 + .../Tango.MachineStudio.MachineDesigner.csproj | 9 + .../ViewModels/MachineVersionDialogVM.cs | 61 + .../ViewModels/MainViewVM.cs | 67 + .../Views/MachineVersionDialog.xaml | 80 ++ .../Views/MachineVersionDialog.xaml.cs | 28 + .../Views/MainView.xaml | 35 +- .../Notifications/DefaultNotificationProvider.cs | 4 + .../Tango.DAL.Local/DB/ACTION_TYPES.cs | 1 - .../DB/APPLICATION_DISPLAY_PANEL_VERSIONS.cs | 1 - .../DB/APPLICATION_FIRMWARE_VERSIONS.cs | 1 - .../Tango.DAL.Local/DB/APPLICATION_OS_VERSIONS.cs | 1 - .../Tango.DAL.Local/DB/APPLICATION_VERSIONS.cs | 1 - .../Tango.DAL.Local/DB/CARTRIDGE_TYPES.cs | 1 - Software/Visual_Studio/Tango.DAL.Local/DB/CAT.cs | 1 - Software/Visual_Studio/Tango.DAL.Local/DB/CCT.cs | 1 - .../Tango.DAL.Local/DB/CONFIGURATION.cs | 1 - .../Tango.DAL.Local/DB/DISPENSER_TYPES.cs | 1 - .../DB/EMBEDDED_FIRMWARE_VERSIONS.cs | 1 - .../DB/EMBEDDED_SOFTWARE_VERSIONS.cs | 1 - .../Tango.DAL.Local/DB/EVENT_TYPES.cs | 1 - .../Tango.DAL.Local/DB/EVENT_TYPES_ACTIONS.cs | 1 - .../Tango.DAL.Local/DB/FIBER_SHAPES.cs | 1 - .../Tango.DAL.Local/DB/FIBER_SYNTHS.cs | 1 - .../Tango.DAL.Local/DB/HARDWARE_VERSIONS.cs | 1 - .../Visual_Studio/Tango.DAL.Local/DB/IDS_PACKS.cs | 1 - .../DB/LINEAR_MASS_DENSITY_UNITS.cs | 1 - .../Tango.DAL.Local/DB/LIQUID_TYPES.cs | 1 - .../Tango.DAL.Local/DB/LIQUID_TYPES_RMLS.cs | 1 - .../Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx | 105 -- .../Tango.DAL.Local/DB/LocalADO.edmx.diagram | 38 +- .../Visual_Studio/Tango.DAL.Local/DB/MACHINE.cs | 1 - .../Tango.DAL.Local/DB/MACHINES_CONFIGURATIONS.cs | 1 - .../Tango.DAL.Local/DB/MACHINES_EVENTS.cs | 1 - .../Tango.DAL.Local/DB/MACHINE_VERSIONS.cs | 1 - .../Tango.DAL.Local/DB/MEDIA_COLORS.cs | 1 - .../Tango.DAL.Local/DB/MEDIA_CONDITIONS.cs | 1 - .../Tango.DAL.Local/DB/MEDIA_MATERIALS.cs | 1 - .../Tango.DAL.Local/DB/MEDIA_PURPOSES.cs | 1 - .../Tango.DAL.Local/DB/MID_TANK_TYPES.cs | 1 - .../Tango.DAL.Local/DB/ORGANIZATION.cs | 1 - .../Visual_Studio/Tango.DAL.Local/DB/PERMISSION.cs | 1 - Software/Visual_Studio/Tango.DAL.Local/DB/RML.cs | 1 - Software/Visual_Studio/Tango.DAL.Local/DB/ROLE.cs | 1 - .../Tango.DAL.Local/DB/ROLES_PERMISSIONS.cs | 1 - .../Tango.DAL.Observables/Entities/Address.cs | 19 + .../Tango.DAL.Observables/Entities/Contact.cs | 19 + .../Tango.DAL.Observables/Entities/User.cs | 19 + .../Tango.DAL.Observables/Entities/UsersRole.cs | 19 + .../Enumerations/MidTankTypes.cs | 6 +- .../Tango.DAL.Observables/IObservableEntity.cs | 15 +- .../Tango.DAL.Observables/ObservableEntity.cs | 73 +- .../ObservablesEntitiesAdapter.cs | 74 +- .../Tango.DAL.Observables/ObservablesGenerator.cs | 16 +- .../Tango.DAL.Observables/Partials/Machine.cs | 27 + .../Partials/MachineVersion.cs | 19 + .../Tango.DAL.Observables/Partials/User.cs | 2 +- .../Tango.DAL.Observables.csproj | 2 + .../Tango.DAL.Remote/DB/ACTION_TYPES.cs | 1 - .../DB/APPLICATION_DISPLAY_PANEL_VERSIONS.cs | 1 - .../DB/APPLICATION_FIRMWARE_VERSIONS.cs | 1 - .../Tango.DAL.Remote/DB/APPLICATION_OS_VERSIONS.cs | 1 - .../Tango.DAL.Remote/DB/APPLICATION_VERSIONS.cs | 1 - .../Tango.DAL.Remote/DB/CARTRIDGE_TYPES.cs | 1 - Software/Visual_Studio/Tango.DAL.Remote/DB/CAT.cs | 1 - Software/Visual_Studio/Tango.DAL.Remote/DB/CCT.cs | 1 - .../Tango.DAL.Remote/DB/CONFIGURATION.cs | 1 - .../Tango.DAL.Remote/DB/DISPENSER_TYPES.cs | 1 - .../DB/EMBEDDED_FIRMWARE_VERSIONS.cs | 1 - .../DB/EMBEDDED_SOFTWARE_VERSIONS.cs | 1 - .../Tango.DAL.Remote/DB/EVENT_TYPES.cs | 1 - .../Tango.DAL.Remote/DB/EVENT_TYPES_ACTIONS.cs | 1 - .../Tango.DAL.Remote/DB/FIBER_SHAPES.cs | 1 - .../Tango.DAL.Remote/DB/FIBER_SYNTHS.cs | 1 - .../Tango.DAL.Remote/DB/HARDWARE_VERSIONS.cs | 1 - .../Visual_Studio/Tango.DAL.Remote/DB/IDS_PACKS.cs | 1 - .../DB/LINEAR_MASS_DENSITY_UNITS.cs | 1 - .../Tango.DAL.Remote/DB/LIQUID_TYPES.cs | 1 - .../Tango.DAL.Remote/DB/LIQUID_TYPES_RMLS.cs | 1 - .../Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs | 1 - .../Tango.DAL.Remote/DB/MACHINES_CONFIGURATIONS.cs | 1 - .../Tango.DAL.Remote/DB/MACHINES_EVENTS.cs | 1 - .../Tango.DAL.Remote/DB/MACHINE_VERSIONS.cs | 1 - .../Tango.DAL.Remote/DB/MEDIA_COLORS.cs | 1 - .../Tango.DAL.Remote/DB/MEDIA_CONDITIONS.cs | 1 - .../Tango.DAL.Remote/DB/MEDIA_MATERIALS.cs | 1 - .../Tango.DAL.Remote/DB/MEDIA_PURPOSES.cs | 1 - .../Tango.DAL.Remote/DB/MID_TANK_TYPES.cs | 1 - .../Tango.DAL.Remote/DB/ORGANIZATION.cs | 1 - .../Tango.DAL.Remote/DB/PERMISSION.cs | 1 - Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs | 1 - Software/Visual_Studio/Tango.DAL.Remote/DB/ROLE.cs | 1 - .../Tango.DAL.Remote/DB/ROLES_PERMISSIONS.cs | 1 - .../Tango.DAL.Remote/DB/RemoteADO.edmx | 145 +- .../Tango.DAL.Remote/DB/RemoteADO.edmx.diagram | 84 +- .../Web/Tango.MachineService/App_Data/Tango.db | Bin 602112 -> 602112 bytes 144 files changed, 7336 insertions(+), 843 deletions(-) create mode 100644 Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cat.java create mode 100644 Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cct.java create mode 100644 Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MidTankType.java create mode 100644 Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MidTankTypes.java create mode 100644 Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/StartDiagnosticsRequestOuterClass.java create mode 100644 Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/StartDiagnosticsResponseOuterClass.java create mode 100644 Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/jobs/Dispenser.java create mode 100644 Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/jobs/Motor.java create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/AutoComplete/MachineVersionsProvider.cs create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineVersionDialogVM.cs create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineVersionDialog.xaml create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineVersionDialog.xaml.cs create mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Partials/Machine.cs create mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Partials/MachineVersion.cs (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/AutoComplete') diff --git a/Software/Android_Studio/Tango.DAL/build.gradle b/Software/Android_Studio/Tango.DAL/build.gradle index cf010e8ba..86c71c619 100644 --- a/Software/Android_Studio/Tango.DAL/build.gradle +++ b/Software/Android_Studio/Tango.DAL/build.gradle @@ -73,4 +73,4 @@ task generateEntities(type: Exec, description: 'Generate DAL Entities') { preBuild.dependsOn(copyFiles) -//preBuild.dependsOn(generateEntities) \ No newline at end of file +preBuild.dependsOn(generateEntities) \ No newline at end of file diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/Entity.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/Entity.java index 6cf88e85e..84b88535a 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/Entity.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/Entity.java @@ -28,9 +28,6 @@ public class Entity extends BaseRXModel @Column(name = "LAST_UPDATED",typeConverter = DateConverter.class) private DateTime last_updated; - @Column(name = "DELETED") - private boolean deleted; - /** * Gets id. * @@ -91,26 +88,6 @@ public class Entity extends BaseRXModel this.last_updated = last_updated; } - /** - * Is deleted boolean. - * - * @return the boolean - */ - public boolean isDeleted() - { - return deleted; - } - - /** - * Sets deleted. - * - * @param deleted the deleted - */ - public void setDeleted(boolean deleted) - { - this.deleted = deleted; - } - /** * Instantiates a new Entity. */ diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/dao/TangoDAO.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/dao/TangoDAO.java index e60d6e134..6b0c83a16 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/dao/TangoDAO.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/dao/TangoDAO.java @@ -8,11 +8,11 @@ import com.twine.tango.dal.entities.ApplicationFirmwareVersion; import com.twine.tango.dal.entities.ApplicationOsVersion; import com.twine.tango.dal.entities.ApplicationVersion; import com.twine.tango.dal.entities.CartridgeType; -import com.twine.tango.dal.entities.Cartridge; +import com.twine.tango.dal.entities.Cat; +import com.twine.tango.dal.entities.Cct; import com.twine.tango.dal.entities.Configuration; import com.twine.tango.dal.entities.Contact; import com.twine.tango.dal.entities.DispenserType; -import com.twine.tango.dal.entities.Dispenser; import com.twine.tango.dal.entities.EmbeddedFirmwareVersion; import com.twine.tango.dal.entities.EmbeddedSoftwareVersion; import com.twine.tango.dal.entities.EventType; @@ -32,6 +32,7 @@ import com.twine.tango.dal.entities.MediaColor; import com.twine.tango.dal.entities.MediaCondition; import com.twine.tango.dal.entities.MediaMaterial; import com.twine.tango.dal.entities.MediaPurpose; +import com.twine.tango.dal.entities.MidTankType; import com.twine.tango.dal.entities.Organization; import com.twine.tango.dal.entities.Permission; import com.twine.tango.dal.entities.Rml; @@ -116,13 +117,23 @@ public class TangoDAO } /** - * Gets all the Cartridges from database. + * Gets all the Cats from database. * - * @return all Cartridges + * @return all Cats */ - public static List getAllCartridges() + public static List getAllCats() { - return SQLite.select().from(Cartridge.class).queryList(); + return SQLite.select().from(Cat.class).queryList(); + } + + /** + * Gets all the Ccts from database. + * + * @return all Ccts + */ + public static List getAllCcts() + { + return SQLite.select().from(Cct.class).queryList(); } /** @@ -155,16 +166,6 @@ public class TangoDAO return SQLite.select().from(DispenserType.class).queryList(); } - /** - * Gets all the Dispensers from database. - * - * @return all Dispensers - */ - public static List getAllDispensers() - { - return SQLite.select().from(Dispenser.class).queryList(); - } - /** * Gets all the EmbeddedFirmwareVersions from database. * @@ -355,6 +356,16 @@ public class TangoDAO return SQLite.select().from(MediaPurpose.class).queryList(); } + /** + * Gets all the MidTankTypes from database. + * + * @return all MidTankTypes + */ + public static List getAllMidTankTypes() + { + return SQLite.select().from(MidTankType.class).queryList(); + } + /** * Gets all the Organizations from database. * diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Address.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Address.java index 199d8f923..7a2a9242f 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Address.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Address.java @@ -13,6 +13,11 @@ import com.twine.tango.dal.TangoDB; public class Address extends Entity { + @Column(name = "DELETED") + private Boolean deleted; + + + @Column(name = "ADDRESS_STRING") private String addressString; @@ -49,6 +54,27 @@ import com.twine.tango.dal.TangoDB; + /** + * Gets the Deleted. + * + * return the Deleted + */ + public Boolean isDeleted() + { + return deleted; + } + + /** + * Sets the Deleted. + * + * @param deleted the Deleted + */ + public void setDeleted(Boolean deleted) + { + this.deleted = deleted; + } + + /** * Gets the AddressString. * diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cat.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cat.java new file mode 100644 index 000000000..026927dd7 --- /dev/null +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cat.java @@ -0,0 +1,94 @@ +package com.twine.tango.dal.entities; + +import com.raizlabs.android.dbflow.annotation.Column; +import com.raizlabs.android.dbflow.annotation.ForeignKey; +import com.raizlabs.android.dbflow.annotation.ForeignKeyReference; +import com.raizlabs.android.dbflow.annotation.Table; +import org.joda.time.DateTime; +import com.twine.tango.dal.Entity; +import com.twine.tango.dal.TangoDB; + + + @Table(name = "CATS", database = TangoDB.class) + public class Cat extends Entity + { + + @Column(name = "DATA") + private byte[] data; + + + + @ForeignKey(references = { @ForeignKeyReference(columnName = "LIQUID_TYPES_GUID", foreignKeyColumnName = "GUID")}) + private LiquidType liquidTypes; + + + + @ForeignKey(references = { @ForeignKeyReference(columnName = "MACHINE_GUID", foreignKeyColumnName = "GUID")}) + private Machine machine; + + + + + /** + * Gets the Data. + * + * return the Data + */ + public byte[] getData() + { + return data; + } + + /** + * Sets the Data. + * + * @param data the Data + */ + public void setData(byte[] data) + { + this.data = data; + } + + + /** + * Gets the LiquidTypes. + * + * return the LiquidTypes + */ + public LiquidType getLiquidTypes() + { + return liquidTypes; + } + + /** + * Sets the LiquidTypes. + * + * @param liquidTypes the LiquidTypes + */ + public void setLiquidTypes(LiquidType liquidTypes) + { + this.liquidTypes = liquidTypes; + } + + + /** + * Gets the Machine. + * + * return the Machine + */ + public Machine getMachine() + { + return machine; + } + + /** + * Sets the Machine. + * + * @param machine the Machine + */ + public void setMachine(Machine machine) + { + this.machine = machine; + } + + } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cct.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cct.java new file mode 100644 index 000000000..398eba866 --- /dev/null +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cct.java @@ -0,0 +1,224 @@ +package com.twine.tango.dal.entities; + +import com.raizlabs.android.dbflow.annotation.Column; +import com.raizlabs.android.dbflow.annotation.ForeignKey; +import com.raizlabs.android.dbflow.annotation.ForeignKeyReference; +import com.raizlabs.android.dbflow.annotation.Table; +import org.joda.time.DateTime; +import com.twine.tango.dal.Entity; +import com.twine.tango.dal.TangoDB; + + + @Table(name = "CCTS", database = TangoDB.class) + public class Cct extends Entity + { + + @Column(name = "NAME") + private String name; + + + + @Column(name = "DESCRIPTION") + private String description; + + + + @Column(name = "FORWARD_FILE_NAME") + private String forwardFileName; + + + + @Column(name = "INVERSE_FILE_NAME") + private String inverseFileName; + + + + @Column(name = "FORWARD_DATA") + private byte[] forwardData; + + + + @Column(name = "INVERSE_DATA") + private byte[] inverseData; + + + + @Column(name = "VERSION") + private Double version; + + + + @ForeignKey(references = { @ForeignKeyReference(columnName = "RML_GUID", foreignKeyColumnName = "GUID")}) + private Rml rml; + + + + + /** + * Gets the Name. + * + * return the Name + */ + public String getName() + { + return name; + } + + /** + * Sets the Name. + * + * @param name the Name + */ + public void setName(String name) + { + this.name = name; + } + + + /** + * Gets the Description. + * + * return the Description + */ + public String getDescription() + { + return description; + } + + /** + * Sets the Description. + * + * @param description the Description + */ + public void setDescription(String description) + { + this.description = description; + } + + + /** + * Gets the ForwardFileName. + * + * return the ForwardFileName + */ + public String getForwardFileName() + { + return forwardFileName; + } + + /** + * Sets the ForwardFileName. + * + * @param forwardFileName the ForwardFileName + */ + public void setForwardFileName(String forwardFileName) + { + this.forwardFileName = forwardFileName; + } + + + /** + * Gets the InverseFileName. + * + * return the InverseFileName + */ + public String getInverseFileName() + { + return inverseFileName; + } + + /** + * Sets the InverseFileName. + * + * @param inverseFileName the InverseFileName + */ + public void setInverseFileName(String inverseFileName) + { + this.inverseFileName = inverseFileName; + } + + + /** + * Gets the ForwardData. + * + * return the ForwardData + */ + public byte[] getForwardData() + { + return forwardData; + } + + /** + * Sets the ForwardData. + * + * @param forwardData the ForwardData + */ + public void setForwardData(byte[] forwardData) + { + this.forwardData = forwardData; + } + + + /** + * Gets the InverseData. + * + * return the InverseData + */ + public byte[] getInverseData() + { + return inverseData; + } + + /** + * Sets the InverseData. + * + * @param inverseData the InverseData + */ + public void setInverseData(byte[] inverseData) + { + this.inverseData = inverseData; + } + + + /** + * Gets the Version. + * + * return the Version + */ + public Double getVersion() + { + return version; + } + + /** + * Sets the Version. + * + * @param version the Version + */ + public void setVersion(Double version) + { + this.version = version; + } + + + /** + * Gets the Rml. + * + * return the Rml + */ + public Rml getRml() + { + return rml; + } + + /** + * Sets the Rml. + * + * @param rml the Rml + */ + public void setRml(Rml rml) + { + this.rml = rml; + } + + } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Configuration.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Configuration.java index 13aeec266..6eaa78902 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Configuration.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Configuration.java @@ -23,38 +23,38 @@ import com.twine.tango.dal.TangoDB; - @ForeignKey(references = { @ForeignKeyReference(columnName = "APPLICATION_DISPLAY_PANEL_VERSION_GUID", foreignKeyColumnName = "GUID")}) - private ApplicationDisplayPanelVersion applicationDisplayPanelVersion; + @ForeignKey(references = { @ForeignKeyReference(columnName = "APPLICATION_DISPLAY_PANEL_VERSIONS_GUID", foreignKeyColumnName = "GUID")}) + private ApplicationDisplayPanelVersion applicationDisplayPanelVersions; - @ForeignKey(references = { @ForeignKeyReference(columnName = "APPLICATION_FIRMWARE_VERSION_GUID", foreignKeyColumnName = "GUID")}) - private ApplicationFirmwareVersion applicationFirmwareVersion; + @ForeignKey(references = { @ForeignKeyReference(columnName = "APPLICATION_FIRMWARE_VERSIONS_GUID", foreignKeyColumnName = "GUID")}) + private ApplicationFirmwareVersion applicationFirmwareVersions; - @ForeignKey(references = { @ForeignKeyReference(columnName = "APPLICATION_OS_VERSION_GUID", foreignKeyColumnName = "GUID")}) - private ApplicationOsVersion applicationOsVersion; + @ForeignKey(references = { @ForeignKeyReference(columnName = "APPLICATION_OS_VERSIONS_GUID", foreignKeyColumnName = "GUID")}) + private ApplicationOsVersion applicationOsVersions; - @ForeignKey(references = { @ForeignKeyReference(columnName = "APPLICATION_VERSION_GUID", foreignKeyColumnName = "GUID")}) - private ApplicationVersion applicationVersion; + @ForeignKey(references = { @ForeignKeyReference(columnName = "APPLICATION_VERSIONS_GUID", foreignKeyColumnName = "GUID")}) + private ApplicationVersion applicationVersions; - @ForeignKey(references = { @ForeignKeyReference(columnName = "EMBEDDED_FIRMWARE_VERSION_GUID", foreignKeyColumnName = "GUID")}) - private EmbeddedFirmwareVersion embeddedFirmwareVersion; + @ForeignKey(references = { @ForeignKeyReference(columnName = "EMBEDDED_FIRMWARE_VERSIONS_GUID", foreignKeyColumnName = "GUID")}) + private EmbeddedFirmwareVersion embeddedFirmwareVersions; - @ForeignKey(references = { @ForeignKeyReference(columnName = "EMBEDDED_SOFTWARE_VERSION_GUID", foreignKeyColumnName = "GUID")}) - private EmbeddedSoftwareVersion embeddedSoftwareVersion; + @ForeignKey(references = { @ForeignKeyReference(columnName = "EMBEDDED_SOFTWARE_VERSIONS_GUID", foreignKeyColumnName = "GUID")}) + private EmbeddedSoftwareVersion embeddedSoftwareVersions; - @ForeignKey(references = { @ForeignKeyReference(columnName = "HARDWARE_VERSION_GUID", foreignKeyColumnName = "GUID")}) - private HardwareVersion hardwareVersion; + @ForeignKey(references = { @ForeignKeyReference(columnName = "HARDWARE_VERSIONS_GUID", foreignKeyColumnName = "GUID")}) + private HardwareVersion hardwareVersions; @@ -102,149 +102,149 @@ import com.twine.tango.dal.TangoDB; /** - * Gets the ApplicationDisplayPanelVersion. + * Gets the ApplicationDisplayPanelVersions. * - * return the ApplicationDisplayPanelVersion + * return the ApplicationDisplayPanelVersions */ - public ApplicationDisplayPanelVersion getApplicationDisplayPanelVersion() + public ApplicationDisplayPanelVersion getApplicationDisplayPanelVersions() { - return applicationDisplayPanelVersion; + return applicationDisplayPanelVersions; } /** - * Sets the ApplicationDisplayPanelVersion. + * Sets the ApplicationDisplayPanelVersions. * - * @param applicationDisplayPanelVersion the ApplicationDisplayPanelVersion + * @param applicationDisplayPanelVersions the ApplicationDisplayPanelVersions */ - public void setApplicationDisplayPanelVersion(ApplicationDisplayPanelVersion applicationDisplayPanelVersion) + public void setApplicationDisplayPanelVersions(ApplicationDisplayPanelVersion applicationDisplayPanelVersions) { - this.applicationDisplayPanelVersion = applicationDisplayPanelVersion; + this.applicationDisplayPanelVersions = applicationDisplayPanelVersions; } /** - * Gets the ApplicationFirmwareVersion. + * Gets the ApplicationFirmwareVersions. * - * return the ApplicationFirmwareVersion + * return the ApplicationFirmwareVersions */ - public ApplicationFirmwareVersion getApplicationFirmwareVersion() + public ApplicationFirmwareVersion getApplicationFirmwareVersions() { - return applicationFirmwareVersion; + return applicationFirmwareVersions; } /** - * Sets the ApplicationFirmwareVersion. + * Sets the ApplicationFirmwareVersions. * - * @param applicationFirmwareVersion the ApplicationFirmwareVersion + * @param applicationFirmwareVersions the ApplicationFirmwareVersions */ - public void setApplicationFirmwareVersion(ApplicationFirmwareVersion applicationFirmwareVersion) + public void setApplicationFirmwareVersions(ApplicationFirmwareVersion applicationFirmwareVersions) { - this.applicationFirmwareVersion = applicationFirmwareVersion; + this.applicationFirmwareVersions = applicationFirmwareVersions; } /** - * Gets the ApplicationOsVersion. + * Gets the ApplicationOsVersions. * - * return the ApplicationOsVersion + * return the ApplicationOsVersions */ - public ApplicationOsVersion getApplicationOsVersion() + public ApplicationOsVersion getApplicationOsVersions() { - return applicationOsVersion; + return applicationOsVersions; } /** - * Sets the ApplicationOsVersion. + * Sets the ApplicationOsVersions. * - * @param applicationOsVersion the ApplicationOsVersion + * @param applicationOsVersions the ApplicationOsVersions */ - public void setApplicationOsVersion(ApplicationOsVersion applicationOsVersion) + public void setApplicationOsVersions(ApplicationOsVersion applicationOsVersions) { - this.applicationOsVersion = applicationOsVersion; + this.applicationOsVersions = applicationOsVersions; } /** - * Gets the ApplicationVersion. + * Gets the ApplicationVersions. * - * return the ApplicationVersion + * return the ApplicationVersions */ - public ApplicationVersion getApplicationVersion() + public ApplicationVersion getApplicationVersions() { - return applicationVersion; + return applicationVersions; } /** - * Sets the ApplicationVersion. + * Sets the ApplicationVersions. * - * @param applicationVersion the ApplicationVersion + * @param applicationVersions the ApplicationVersions */ - public void setApplicationVersion(ApplicationVersion applicationVersion) + public void setApplicationVersions(ApplicationVersion applicationVersions) { - this.applicationVersion = applicationVersion; + this.applicationVersions = applicationVersions; } /** - * Gets the EmbeddedFirmwareVersion. + * Gets the EmbeddedFirmwareVersions. * - * return the EmbeddedFirmwareVersion + * return the EmbeddedFirmwareVersions */ - public EmbeddedFirmwareVersion getEmbeddedFirmwareVersion() + public EmbeddedFirmwareVersion getEmbeddedFirmwareVersions() { - return embeddedFirmwareVersion; + return embeddedFirmwareVersions; } /** - * Sets the EmbeddedFirmwareVersion. + * Sets the EmbeddedFirmwareVersions. * - * @param embeddedFirmwareVersion the EmbeddedFirmwareVersion + * @param embeddedFirmwareVersions the EmbeddedFirmwareVersions */ - public void setEmbeddedFirmwareVersion(EmbeddedFirmwareVersion embeddedFirmwareVersion) + public void setEmbeddedFirmwareVersions(EmbeddedFirmwareVersion embeddedFirmwareVersions) { - this.embeddedFirmwareVersion = embeddedFirmwareVersion; + this.embeddedFirmwareVersions = embeddedFirmwareVersions; } /** - * Gets the EmbeddedSoftwareVersion. + * Gets the EmbeddedSoftwareVersions. * - * return the EmbeddedSoftwareVersion + * return the EmbeddedSoftwareVersions */ - public EmbeddedSoftwareVersion getEmbeddedSoftwareVersion() + public EmbeddedSoftwareVersion getEmbeddedSoftwareVersions() { - return embeddedSoftwareVersion; + return embeddedSoftwareVersions; } /** - * Sets the EmbeddedSoftwareVersion. + * Sets the EmbeddedSoftwareVersions. * - * @param embeddedSoftwareVersion the EmbeddedSoftwareVersion + * @param embeddedSoftwareVersions the EmbeddedSoftwareVersions */ - public void setEmbeddedSoftwareVersion(EmbeddedSoftwareVersion embeddedSoftwareVersion) + public void setEmbeddedSoftwareVersions(EmbeddedSoftwareVersion embeddedSoftwareVersions) { - this.embeddedSoftwareVersion = embeddedSoftwareVersion; + this.embeddedSoftwareVersions = embeddedSoftwareVersions; } /** - * Gets the HardwareVersion. + * Gets the HardwareVersions. * - * return the HardwareVersion + * return the HardwareVersions */ - public HardwareVersion getHardwareVersion() + public HardwareVersion getHardwareVersions() { - return hardwareVersion; + return hardwareVersions; } /** - * Sets the HardwareVersion. + * Sets the HardwareVersions. * - * @param hardwareVersion the HardwareVersion + * @param hardwareVersions the HardwareVersions */ - public void setHardwareVersion(HardwareVersion hardwareVersion) + public void setHardwareVersions(HardwareVersion hardwareVersions) { - this.hardwareVersion = hardwareVersion; + this.hardwareVersions = hardwareVersions; } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Contact.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Contact.java index d4bc21b34..9f84e1038 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Contact.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Contact.java @@ -13,6 +13,11 @@ import com.twine.tango.dal.TangoDB; public class Contact extends Entity { + @Column(name = "DELETED") + private Boolean deleted; + + + @Column(name = "FIRST_NAME") private String firstName; @@ -44,6 +49,27 @@ import com.twine.tango.dal.TangoDB; + /** + * Gets the Deleted. + * + * return the Deleted + */ + public Boolean isDeleted() + { + return deleted; + } + + /** + * Sets the Deleted. + * + * @param deleted the Deleted + */ + public void setDeleted(Boolean deleted) + { + this.deleted = deleted; + } + + /** * Gets the FirstName. * diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/DispenserType.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/DispenserType.java index 321ba241b..6739b3e89 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/DispenserType.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/DispenserType.java @@ -22,6 +22,16 @@ import com.twine.tango.dal.TangoDB; private String name; + + @Column(name = "NL_PER_PULSE") + private Double nlPerPulse; + + + + @Column(name = "CAPACITY") + private Double capacity; + + /** @@ -65,4 +75,46 @@ import com.twine.tango.dal.TangoDB; this.name = name; } + + /** + * Gets the NlPerPulse. + * + * return the NlPerPulse + */ + public Double getNlPerPulse() + { + return nlPerPulse; + } + + /** + * Sets the NlPerPulse. + * + * @param nlPerPulse the NlPerPulse + */ + public void setNlPerPulse(Double nlPerPulse) + { + this.nlPerPulse = nlPerPulse; + } + + + /** + * Gets the Capacity. + * + * return the Capacity + */ + public Double getCapacity() + { + return capacity; + } + + /** + * Sets the Capacity. + * + * @param capacity the Capacity + */ + public void setCapacity(Double capacity) + { + this.capacity = capacity; + } + } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesAction.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesAction.java index 9f69b2592..7189d6066 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesAction.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesAction.java @@ -13,56 +13,56 @@ import com.twine.tango.dal.TangoDB; public class EventTypesAction extends Entity { - @ForeignKey(references = { @ForeignKeyReference(columnName = "ACTION_TYPE_GUID", foreignKeyColumnName = "GUID")}) - private ActionType actionType; + @ForeignKey(references = { @ForeignKeyReference(columnName = "ACTION_TYPES_GUID", foreignKeyColumnName = "GUID")}) + private ActionType actionTypes; - @ForeignKey(references = { @ForeignKeyReference(columnName = "EVENT_TYPE_GUID", foreignKeyColumnName = "GUID")}) - private EventType eventType; + @ForeignKey(references = { @ForeignKeyReference(columnName = "EVENT_TYPES_GUID", foreignKeyColumnName = "GUID")}) + private EventType eventTypes; /** - * Gets the ActionType. + * Gets the ActionTypes. * - * return the ActionType + * return the ActionTypes */ - public ActionType getActionType() + public ActionType getActionTypes() { - return actionType; + return actionTypes; } /** - * Sets the ActionType. + * Sets the ActionTypes. * - * @param actionType the ActionType + * @param actionTypes the ActionTypes */ - public void setActionType(ActionType actionType) + public void setActionTypes(ActionType actionTypes) { - this.actionType = actionType; + this.actionTypes = actionTypes; } /** - * Gets the EventType. + * Gets the EventTypes. * - * return the EventType + * return the EventTypes */ - public EventType getEventType() + public EventType getEventTypes() { - return eventType; + return eventTypes; } /** - * Sets the EventType. + * Sets the EventTypes. * - * @param eventType the EventType + * @param eventTypes the EventTypes */ - public void setEventType(EventType eventType) + public void setEventTypes(EventType eventTypes) { - this.eventType = eventType; + this.eventTypes = eventTypes; } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPack.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPack.java index 3fb61d0a1..75699cfd7 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPack.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPack.java @@ -18,8 +18,13 @@ import com.twine.tango.dal.TangoDB; - @ForeignKey(references = { @ForeignKeyReference(columnName = "CARTRIDGE_GUID", foreignKeyColumnName = "GUID")}) - private Cartridge cartridge; + @Column(name = "PACK_INDEX") + private int packIndex; + + + + @ForeignKey(references = { @ForeignKeyReference(columnName = "CARTRIDGE_TYPES_GUID", foreignKeyColumnName = "GUID")}) + private CartridgeType cartridgeTypes; @@ -28,13 +33,18 @@ import com.twine.tango.dal.TangoDB; - @ForeignKey(references = { @ForeignKeyReference(columnName = "DISPENSER_GUID", foreignKeyColumnName = "GUID")}) - private Dispenser dispenser; + @ForeignKey(references = { @ForeignKeyReference(columnName = "DISPENSER_TYPES_GUID", foreignKeyColumnName = "GUID")}) + private DispenserType dispenserTypes; + + + + @ForeignKey(references = { @ForeignKeyReference(columnName = "LIQUID_TYPES_GUID", foreignKeyColumnName = "GUID")}) + private LiquidType liquidTypes; - @ForeignKey(references = { @ForeignKeyReference(columnName = "LIQUID_TYPE_GUID", foreignKeyColumnName = "GUID")}) - private LiquidType liquidType; + @ForeignKey(references = { @ForeignKeyReference(columnName = "MID_TANK_TYPES_GUID", foreignKeyColumnName = "GUID")}) + private MidTankType midTankTypes; @@ -61,23 +71,44 @@ import com.twine.tango.dal.TangoDB; /** - * Gets the Cartridge. + * Gets the PackIndex. + * + * return the PackIndex + */ + public int getPackIndex() + { + return packIndex; + } + + /** + * Sets the PackIndex. + * + * @param packIndex the PackIndex + */ + public void setPackIndex(int packIndex) + { + this.packIndex = packIndex; + } + + + /** + * Gets the CartridgeTypes. * - * return the Cartridge + * return the CartridgeTypes */ - public Cartridge getCartridge() + public CartridgeType getCartridgeTypes() { - return cartridge; + return cartridgeTypes; } /** - * Sets the Cartridge. + * Sets the CartridgeTypes. * - * @param cartridge the Cartridge + * @param cartridgeTypes the CartridgeTypes */ - public void setCartridge(Cartridge cartridge) + public void setCartridgeTypes(CartridgeType cartridgeTypes) { - this.cartridge = cartridge; + this.cartridgeTypes = cartridgeTypes; } @@ -103,44 +134,65 @@ import com.twine.tango.dal.TangoDB; /** - * Gets the Dispenser. + * Gets the DispenserTypes. + * + * return the DispenserTypes + */ + public DispenserType getDispenserTypes() + { + return dispenserTypes; + } + + /** + * Sets the DispenserTypes. + * + * @param dispenserTypes the DispenserTypes + */ + public void setDispenserTypes(DispenserType dispenserTypes) + { + this.dispenserTypes = dispenserTypes; + } + + + /** + * Gets the LiquidTypes. * - * return the Dispenser + * return the LiquidTypes */ - public Dispenser getDispenser() + public LiquidType getLiquidTypes() { - return dispenser; + return liquidTypes; } /** - * Sets the Dispenser. + * Sets the LiquidTypes. * - * @param dispenser the Dispenser + * @param liquidTypes the LiquidTypes */ - public void setDispenser(Dispenser dispenser) + public void setLiquidTypes(LiquidType liquidTypes) { - this.dispenser = dispenser; + this.liquidTypes = liquidTypes; } /** - * Gets the LiquidType. + * Gets the MidTankTypes. * - * return the LiquidType + * return the MidTankTypes */ - public LiquidType getLiquidType() + public MidTankType getMidTankTypes() { - return liquidType; + return midTankTypes; } /** - * Sets the LiquidType. + * Sets the MidTankTypes. * - * @param liquidType the LiquidType + * @param midTankTypes the MidTankTypes */ - public void setLiquidType(LiquidType liquidType) + public void setMidTankTypes(MidTankType midTankTypes) { - this.liquidType = liquidType; + this.midTankTypes = midTankTypes; } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypesRml.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypesRml.java index db5f43933..b708557fb 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypesRml.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypesRml.java @@ -13,8 +13,13 @@ import com.twine.tango.dal.TangoDB; public class LiquidTypesRml extends Entity { - @ForeignKey(references = { @ForeignKeyReference(columnName = "LIQUID_TYPE_GUID", foreignKeyColumnName = "GUID")}) - private LiquidType liquidType; + @Column(name = "MAX_NL_PER_CM") + private Double maxNlPerCm; + + + + @ForeignKey(references = { @ForeignKeyReference(columnName = "LIQUID_TYPES_GUID", foreignKeyColumnName = "GUID")}) + private LiquidType liquidTypes; @@ -25,23 +30,44 @@ import com.twine.tango.dal.TangoDB; /** - * Gets the LiquidType. + * Gets the MaxNlPerCm. + * + * return the MaxNlPerCm + */ + public Double getMaxNlPerCm() + { + return maxNlPerCm; + } + + /** + * Sets the MaxNlPerCm. + * + * @param maxNlPerCm the MaxNlPerCm + */ + public void setMaxNlPerCm(Double maxNlPerCm) + { + this.maxNlPerCm = maxNlPerCm; + } + + + /** + * Gets the LiquidTypes. * - * return the LiquidType + * return the LiquidTypes */ - public LiquidType getLiquidType() + public LiquidType getLiquidTypes() { - return liquidType; + return liquidTypes; } /** - * Sets the LiquidType. + * Sets the LiquidTypes. * - * @param liquidType the LiquidType + * @param liquidTypes the LiquidTypes */ - public void setLiquidType(LiquidType liquidType) + public void setLiquidTypes(LiquidType liquidTypes) { - this.liquidType = liquidType; + this.liquidTypes = liquidTypes; } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Machine.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Machine.java index 778974f2c..660e1e188 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Machine.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Machine.java @@ -33,8 +33,8 @@ import com.twine.tango.dal.TangoDB; - @ForeignKey(references = { @ForeignKeyReference(columnName = "MACHINE_VERSION_GUID", foreignKeyColumnName = "GUID")}) - private MachineVersion machineVersion; + @ForeignKey(references = { @ForeignKeyReference(columnName = "MACHINE_VERSIONS_GUID", foreignKeyColumnName = "GUID")}) + private MachineVersion machineVersions; @@ -129,23 +129,23 @@ import com.twine.tango.dal.TangoDB; /** - * Gets the MachineVersion. + * Gets the MachineVersions. * - * return the MachineVersion + * return the MachineVersions */ - public MachineVersion getMachineVersion() + public MachineVersion getMachineVersions() { - return machineVersion; + return machineVersions; } /** - * Sets the MachineVersion. + * Sets the MachineVersions. * - * @param machineVersion the MachineVersion + * @param machineVersions the MachineVersions */ - public void setMachineVersion(MachineVersion machineVersion) + public void setMachineVersions(MachineVersion machineVersions) { - this.machineVersion = machineVersion; + this.machineVersions = machineVersions; } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesEvent.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesEvent.java index 85cde559a..c60a46ef2 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesEvent.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesEvent.java @@ -23,8 +23,8 @@ import com.twine.tango.dal.TangoDB; - @ForeignKey(references = { @ForeignKeyReference(columnName = "EVENT_TYPE_GUID", foreignKeyColumnName = "GUID")}) - private EventType eventType; + @ForeignKey(references = { @ForeignKeyReference(columnName = "EVENT_TYPES_GUID", foreignKeyColumnName = "GUID")}) + private EventType eventTypes; @@ -82,23 +82,23 @@ import com.twine.tango.dal.TangoDB; /** - * Gets the EventType. + * Gets the EventTypes. * - * return the EventType + * return the EventTypes */ - public EventType getEventType() + public EventType getEventTypes() { - return eventType; + return eventTypes; } /** - * Sets the EventType. + * Sets the EventTypes. * - * @param eventType the EventType + * @param eventTypes the EventTypes */ - public void setEventType(EventType eventType) + public void setEventTypes(EventType eventTypes) { - this.eventType = eventType; + this.eventTypes = eventTypes; } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MidTankType.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MidTankType.java new file mode 100644 index 000000000..a934ee8f6 --- /dev/null +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MidTankType.java @@ -0,0 +1,94 @@ +package com.twine.tango.dal.entities; + +import com.raizlabs.android.dbflow.annotation.Column; +import com.raizlabs.android.dbflow.annotation.ForeignKey; +import com.raizlabs.android.dbflow.annotation.ForeignKeyReference; +import com.raizlabs.android.dbflow.annotation.Table; +import org.joda.time.DateTime; +import com.twine.tango.dal.Entity; +import com.twine.tango.dal.TangoDB; + + + @Table(name = "MID_TANK_TYPES", database = TangoDB.class) + public class MidTankType extends Entity + { + + @Column(name = "CODE") + private int code; + + + + @Column(name = "NAME") + private String name; + + + + @Column(name = "LITER_CAPACITY") + private Double literCapacity; + + + + + /** + * Gets the Code. + * + * return the Code + */ + public int getCode() + { + return code; + } + + /** + * Sets the Code. + * + * @param code the Code + */ + public void setCode(int code) + { + this.code = code; + } + + + /** + * Gets the Name. + * + * return the Name + */ + public String getName() + { + return name; + } + + /** + * Sets the Name. + * + * @param name the Name + */ + public void setName(String name) + { + this.name = name; + } + + + /** + * Gets the LiterCapacity. + * + * return the LiterCapacity + */ + public Double getLiterCapacity() + { + return literCapacity; + } + + /** + * Sets the LiterCapacity. + * + * @param literCapacity the LiterCapacity + */ + public void setLiterCapacity(Double literCapacity) + { + this.literCapacity = literCapacity; + } + + } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Rml.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Rml.java index 5f7fe528d..d796ee690 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Rml.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Rml.java @@ -13,6 +13,11 @@ import com.twine.tango.dal.TangoDB; public class Rml extends Entity { + @Column(name = "NAME") + private String name; + + + @Column(name = "MANUFACTURER") private String manufacturer; @@ -23,8 +28,8 @@ import com.twine.tango.dal.TangoDB; - @Column(name = "NUMBER_OF_FIBER") - private int numberOfFiber; + @Column(name = "NUMBER_OF_FIBERS") + private int numberOfFibers; @@ -68,42 +73,63 @@ import com.twine.tango.dal.TangoDB; - @ForeignKey(references = { @ForeignKeyReference(columnName = "FIBER_SHAPE_GUID", foreignKeyColumnName = "GUID")}) - private FiberShape fiberShape; + @ForeignKey(references = { @ForeignKeyReference(columnName = "FIBER_SHAPES_GUID", foreignKeyColumnName = "GUID")}) + private FiberShape fiberShapes; - @ForeignKey(references = { @ForeignKeyReference(columnName = "FIBER_SYNTH_GUID", foreignKeyColumnName = "GUID")}) - private FiberSynth fiberSynth; + @ForeignKey(references = { @ForeignKeyReference(columnName = "FIBER_SYNTHS_GUID", foreignKeyColumnName = "GUID")}) + private FiberSynth fiberSynths; - @ForeignKey(references = { @ForeignKeyReference(columnName = "LINEAR_MASS_DENSITY_UNIT_GUID", foreignKeyColumnName = "GUID")}) - private LinearMassDensityUnit linearMassDensityUnit; + @ForeignKey(references = { @ForeignKeyReference(columnName = "LINEAR_MASS_DENSITY_UNITS_GUID", foreignKeyColumnName = "GUID")}) + private LinearMassDensityUnit linearMassDensityUnits; - @ForeignKey(references = { @ForeignKeyReference(columnName = "MEDIA_COLOR_GUID", foreignKeyColumnName = "GUID")}) - private MediaColor mediaColor; + @ForeignKey(references = { @ForeignKeyReference(columnName = "MEDIA_COLORS_GUID", foreignKeyColumnName = "GUID")}) + private MediaColor mediaColors; - @ForeignKey(references = { @ForeignKeyReference(columnName = "MEDIA_CONDITION_GUID", foreignKeyColumnName = "GUID")}) - private MediaCondition mediaCondition; + @ForeignKey(references = { @ForeignKeyReference(columnName = "MEDIA_CONDITIONS_GUID", foreignKeyColumnName = "GUID")}) + private MediaCondition mediaConditions; - @ForeignKey(references = { @ForeignKeyReference(columnName = "MEDIA_MATERIAL_GUID", foreignKeyColumnName = "GUID")}) - private MediaMaterial mediaMaterial; + @ForeignKey(references = { @ForeignKeyReference(columnName = "MEDIA_MATERIALS_GUID", foreignKeyColumnName = "GUID")}) + private MediaMaterial mediaMaterials; - @ForeignKey(references = { @ForeignKeyReference(columnName = "MEDIA_PURPOSE_GUID", foreignKeyColumnName = "GUID")}) - private MediaPurpose mediaPurpose; + @ForeignKey(references = { @ForeignKeyReference(columnName = "MEDIA_PURPOSES_GUID", foreignKeyColumnName = "GUID")}) + private MediaPurpose mediaPurposes; + /** + * Gets the Name. + * + * return the Name + */ + public String getName() + { + return name; + } + + /** + * Sets the Name. + * + * @param name the Name + */ + public void setName(String name) + { + this.name = name; + } + + /** * Gets the Manufacturer. * @@ -147,23 +173,23 @@ import com.twine.tango.dal.TangoDB; /** - * Gets the NumberOfFiber. + * Gets the NumberOfFibers. * - * return the NumberOfFiber + * return the NumberOfFibers */ - public int getNumberOfFiber() + public int getNumberOfFibers() { - return numberOfFiber; + return numberOfFibers; } /** - * Sets the NumberOfFiber. + * Sets the NumberOfFibers. * - * @param numberOfFiber the NumberOfFiber + * @param numberOfFibers the NumberOfFibers */ - public void setNumberOfFiber(int numberOfFiber) + public void setNumberOfFibers(int numberOfFibers) { - this.numberOfFiber = numberOfFiber; + this.numberOfFibers = numberOfFibers; } @@ -336,149 +362,149 @@ import com.twine.tango.dal.TangoDB; /** - * Gets the FiberShape. + * Gets the FiberShapes. * - * return the FiberShape + * return the FiberShapes */ - public FiberShape getFiberShape() + public FiberShape getFiberShapes() { - return fiberShape; + return fiberShapes; } /** - * Sets the FiberShape. + * Sets the FiberShapes. * - * @param fiberShape the FiberShape + * @param fiberShapes the FiberShapes */ - public void setFiberShape(FiberShape fiberShape) + public void setFiberShapes(FiberShape fiberShapes) { - this.fiberShape = fiberShape; + this.fiberShapes = fiberShapes; } /** - * Gets the FiberSynth. + * Gets the FiberSynths. * - * return the FiberSynth + * return the FiberSynths */ - public FiberSynth getFiberSynth() + public FiberSynth getFiberSynths() { - return fiberSynth; + return fiberSynths; } /** - * Sets the FiberSynth. + * Sets the FiberSynths. * - * @param fiberSynth the FiberSynth + * @param fiberSynths the FiberSynths */ - public void setFiberSynth(FiberSynth fiberSynth) + public void setFiberSynths(FiberSynth fiberSynths) { - this.fiberSynth = fiberSynth; + this.fiberSynths = fiberSynths; } /** - * Gets the LinearMassDensityUnit. + * Gets the LinearMassDensityUnits. * - * return the LinearMassDensityUnit + * return the LinearMassDensityUnits */ - public LinearMassDensityUnit getLinearMassDensityUnit() + public LinearMassDensityUnit getLinearMassDensityUnits() { - return linearMassDensityUnit; + return linearMassDensityUnits; } /** - * Sets the LinearMassDensityUnit. + * Sets the LinearMassDensityUnits. * - * @param linearMassDensityUnit the LinearMassDensityUnit + * @param linearMassDensityUnits the LinearMassDensityUnits */ - public void setLinearMassDensityUnit(LinearMassDensityUnit linearMassDensityUnit) + public void setLinearMassDensityUnits(LinearMassDensityUnit linearMassDensityUnits) { - this.linearMassDensityUnit = linearMassDensityUnit; + this.linearMassDensityUnits = linearMassDensityUnits; } /** - * Gets the MediaColor. + * Gets the MediaColors. * - * return the MediaColor + * return the MediaColors */ - public MediaColor getMediaColor() + public MediaColor getMediaColors() { - return mediaColor; + return mediaColors; } /** - * Sets the MediaColor. + * Sets the MediaColors. * - * @param mediaColor the MediaColor + * @param mediaColors the MediaColors */ - public void setMediaColor(MediaColor mediaColor) + public void setMediaColors(MediaColor mediaColors) { - this.mediaColor = mediaColor; + this.mediaColors = mediaColors; } /** - * Gets the MediaCondition. + * Gets the MediaConditions. * - * return the MediaCondition + * return the MediaConditions */ - public MediaCondition getMediaCondition() + public MediaCondition getMediaConditions() { - return mediaCondition; + return mediaConditions; } /** - * Sets the MediaCondition. + * Sets the MediaConditions. * - * @param mediaCondition the MediaCondition + * @param mediaConditions the MediaConditions */ - public void setMediaCondition(MediaCondition mediaCondition) + public void setMediaConditions(MediaCondition mediaConditions) { - this.mediaCondition = mediaCondition; + this.mediaConditions = mediaConditions; } /** - * Gets the MediaMaterial. + * Gets the MediaMaterials. * - * return the MediaMaterial + * return the MediaMaterials */ - public MediaMaterial getMediaMaterial() + public MediaMaterial getMediaMaterials() { - return mediaMaterial; + return mediaMaterials; } /** - * Sets the MediaMaterial. + * Sets the MediaMaterials. * - * @param mediaMaterial the MediaMaterial + * @param mediaMaterials the MediaMaterials */ - public void setMediaMaterial(MediaMaterial mediaMaterial) + public void setMediaMaterials(MediaMaterial mediaMaterials) { - this.mediaMaterial = mediaMaterial; + this.mediaMaterials = mediaMaterials; } /** - * Gets the MediaPurpose. + * Gets the MediaPurposes. * - * return the MediaPurpose + * return the MediaPurposes */ - public MediaPurpose getMediaPurpose() + public MediaPurpose getMediaPurposes() { - return mediaPurpose; + return mediaPurposes; } /** - * Sets the MediaPurpose. + * Sets the MediaPurposes. * - * @param mediaPurpose the MediaPurpose + * @param mediaPurposes the MediaPurposes */ - public void setMediaPurpose(MediaPurpose mediaPurpose) + public void setMediaPurposes(MediaPurpose mediaPurposes) { - this.mediaPurpose = mediaPurpose; + this.mediaPurposes = mediaPurposes; } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/User.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/User.java index 5a346a620..8694bfefc 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/User.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/User.java @@ -13,6 +13,11 @@ import com.twine.tango.dal.TangoDB; public class User extends Entity { + @Column(name = "DELETED") + private Boolean deleted; + + + @Column(name = "EMAIL") private String email; @@ -39,6 +44,27 @@ import com.twine.tango.dal.TangoDB; + /** + * Gets the Deleted. + * + * return the Deleted + */ + public Boolean isDeleted() + { + return deleted; + } + + /** + * Sets the Deleted. + * + * @param deleted the Deleted + */ + public void setDeleted(Boolean deleted) + { + this.deleted = deleted; + } + + /** * Gets the Email. * diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UsersRole.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UsersRole.java index ad1c44bd1..c40c669f2 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UsersRole.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UsersRole.java @@ -13,6 +13,11 @@ import com.twine.tango.dal.TangoDB; public class UsersRole extends Entity { + @Column(name = "DELETED") + private Boolean deleted; + + + @ForeignKey(references = { @ForeignKeyReference(columnName = "ROLE_GUID", foreignKeyColumnName = "GUID")}) private Role role; @@ -24,6 +29,27 @@ import com.twine.tango.dal.TangoDB; + /** + * Gets the Deleted. + * + * return the Deleted + */ + public Boolean isDeleted() + { + return deleted; + } + + /** + * Sets the Deleted. + * + * @param deleted the Deleted + */ + public void setDeleted(Boolean deleted) + { + this.deleted = deleted; + } + + /** * Gets the Role. * diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/FiberShapes.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/FiberShapes.java index d146cd79a..10411d66a 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/FiberShapes.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/FiberShapes.java @@ -4,6 +4,10 @@ import com.twine.tango.core.DescriptionAnnotation; public enum FiberShapes { + + @DescriptionAnnotation(description = "Triangle") + Triangle(1), + ; private int value; diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/FiberSynths.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/FiberSynths.java index 0b8b6384d..03f2f950b 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/FiberSynths.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/FiberSynths.java @@ -4,6 +4,10 @@ import com.twine.tango.core.DescriptionAnnotation; public enum FiberSynths { + + @DescriptionAnnotation(description = "Some syntheses type") + Somesynthesestype(1), + ; private int value; diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/LinearMassDensityUnits.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/LinearMassDensityUnits.java index 495a187f1..1cc561b63 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/LinearMassDensityUnits.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/LinearMassDensityUnits.java @@ -4,6 +4,10 @@ import com.twine.tango.core.DescriptionAnnotation; public enum LinearMassDensityUnits { + + @DescriptionAnnotation(description = "Dex") + Dex(1), + ; private int value; diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/LiquidTypes.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/LiquidTypes.java index d2d480167..5b9d52450 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/LiquidTypes.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/LiquidTypes.java @@ -8,9 +8,24 @@ public enum LiquidTypes @DescriptionAnnotation(description = "Cyan") Cyan(1), + @DescriptionAnnotation(description = "Red") + Red(7), + + @DescriptionAnnotation(description = "Transparent Ink") + TransparentInk(6), + @DescriptionAnnotation(description = "Magenta") Magenta(2), + @DescriptionAnnotation(description = "Lubricant") + Lubricant(5), + + @DescriptionAnnotation(description = "Yellow") + Yellow(2), + + @DescriptionAnnotation(description = "Black") + Black(4), + ; private int value; diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaConditions.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaConditions.java index 7fc83ad16..b083f111a 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaConditions.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaConditions.java @@ -4,6 +4,10 @@ import com.twine.tango.core.DescriptionAnnotation; public enum MediaConditions { + + @DescriptionAnnotation(description = "Treated") + Treated(1), + ; private int value; diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaMaterials.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaMaterials.java index ca2b458af..87c8313a9 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaMaterials.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaMaterials.java @@ -4,6 +4,10 @@ import com.twine.tango.core.DescriptionAnnotation; public enum MediaMaterials { + + @DescriptionAnnotation(description = "Nylon") + Nylon(1), + ; private int value; diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaPurposes.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaPurposes.java index 8cf72e8e0..ac68e56df 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaPurposes.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaPurposes.java @@ -4,6 +4,10 @@ import com.twine.tango.core.DescriptionAnnotation; public enum MediaPurposes { + + @DescriptionAnnotation(description = "Embroidery") + Embroidery(1), + ; private int value; diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MidTankTypes.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MidTankTypes.java new file mode 100644 index 000000000..a1122db40 --- /dev/null +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MidTankTypes.java @@ -0,0 +1,19 @@ +package com.twine.tango.dal.enumerations; + +import com.twine.tango.core.DescriptionAnnotation; + +public enum MidTankTypes +{ + + @DescriptionAnnotation(description = "Liter Tank 2") + LiterTank2(1), + + ; + + private int value; + + MidTankTypes(int value) + { + this.value = value; + } +} diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Permissions.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Permissions.java index b280489a4..b8c324466 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Permissions.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Permissions.java @@ -17,6 +17,9 @@ public enum Permissions @DescriptionAnnotation(description = "Allows loading the synchronization module in machine studio") RunSynchronizationModule(3), + @DescriptionAnnotation(description = "Allows loading the machine designer module in Machine Studio") + RunMachineDesignerModule(4), + ; private int value; diff --git a/Software/Android_Studio/Tango.DAL/src/main/res/raw/tangodb b/Software/Android_Studio/Tango.DAL/src/main/res/raw/tangodb index 12c88039d..147c930c6 100644 Binary files a/Software/Android_Studio/Tango.DAL/src/main/res/raw/tangodb and b/Software/Android_Studio/Tango.DAL/src/main/res/raw/tangodb differ diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/common/MessageTypeOuterClass.java b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/common/MessageTypeOuterClass.java index 42b46a576..0b4c2fb97 100644 --- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/common/MessageTypeOuterClass.java +++ b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/common/MessageTypeOuterClass.java @@ -20,6 +20,10 @@ public final class MessageTypeOuterClass { public enum MessageType implements com.google.protobuf.ProtocolMessageEnum { /** + * 
+     *Common
+     *
+ * * RGB = 0; */ RGB(0), @@ -211,10 +215,26 @@ public final class MessageTypeOuterClass { * KeepAliveResponse = 1008; */ KeepAliveResponse(1008), + /** + * 
+     *Diagnostics
+     *
+ * + * StartDiagnosticsRequest = 2000; + */ + StartDiagnosticsRequest(2000), + /** + * StartDiagnosticsResponse = 2001; + */ + StartDiagnosticsResponse(2001), UNRECOGNIZED(-1), ; /** + * 
+     *Common
+     *
+ * * RGB = 0; */ public static final int RGB_VALUE = 0; @@ -406,6 +426,18 @@ public final class MessageTypeOuterClass { * KeepAliveResponse = 1008; */ public static final int KeepAliveResponse_VALUE = 1008; + /** + * 
+     *Diagnostics
+     *
+ * + * StartDiagnosticsRequest = 2000; + */ + public static final int StartDiagnosticsRequest_VALUE = 2000; + /** + * StartDiagnosticsResponse = 2001; + */ + public static final int StartDiagnosticsResponse_VALUE = 2001; public final int getNumber() { @@ -472,6 +504,8 @@ public final class MessageTypeOuterClass { case 1006: return OverrideDataBaseResponse; case 1007: return KeepAliveRequest; case 1008: return KeepAliveResponse; + case 2000: return StartDiagnosticsRequest; + case 2001: return StartDiagnosticsResponse; default: return null; } } @@ -533,7 +567,7 @@ public final class MessageTypeOuterClass { descriptor; static { java.lang.String[] descriptorData = { - "\n\021MessageType.proto\022\020Tango.PMR.Common*\204\n" + + "\n\021MessageType.proto\022\020Tango.PMR.Common*\301\n" + "\n\013MessageType\022\007\n\003RGB\020\000\022\007\n\003Job\020\001\022\013\n\007Segme" + "nt\020\002\022\024\n\020CalculateRequest\020\003\022\025\n\021CalculateR" + "esponse\020\004\022\023\n\017ProgressRequest\020\005\022\024\n\020Progre" + @@ -566,8 +600,9 @@ public final class MessageTypeOuterClass { "ationResponse\020\354\007\022\034\n\027OverrideDataBaseRequ" + "est\020\355\007\022\035\n\030OverrideDataBaseResponse\020\356\007\022\025\n" + "\020KeepAliveRequest\020\357\007\022\026\n\021KeepAliveRespons" + - "e\020\360\007B\034\n\032com.twine.tango.pmr.commonb\006prot" + - "o3" + "e\020\360\007\022\034\n\027StartDiagnosticsRequest\020\320\017\022\035\n\030St" + + "artDiagnosticsResponse\020\321\017B\034\n\032com.twine.t" + + "ango.pmr.commonb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/StartDiagnosticsRequestOuterClass.java b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/StartDiagnosticsRequestOuterClass.java new file mode 100644 index 000000000..f4d31c154 --- /dev/null +++ b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/StartDiagnosticsRequestOuterClass.java @@ -0,0 +1,635 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: StartDiagnosticsRequest.proto + +package com.twine.tango.pmr.diagnostics; + +public final class StartDiagnosticsRequestOuterClass { + private StartDiagnosticsRequestOuterClass() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); + } + public interface StartDiagnosticsRequestOrBuilder extends + // @@protoc_insertion_point(interface_extends:Tango.PMR.Diagnostics.StartDiagnosticsRequest) + com.google.protobuf.MessageOrBuilder { + + /** + * bool PushSensors = 1; + */ + boolean getPushSensors(); + + /** + * bool PushMotors = 2; + */ + boolean getPushMotors(); + + /** + * bool PushLogs = 3; + */ + boolean getPushLogs(); + } + /** + * Protobuf type {@code Tango.PMR.Diagnostics.StartDiagnosticsRequest} + */ + public static final class StartDiagnosticsRequest extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:Tango.PMR.Diagnostics.StartDiagnosticsRequest) + StartDiagnosticsRequestOrBuilder { + private static final long serialVersionUID = 0L; + // Use StartDiagnosticsRequest.newBuilder() to construct. + private StartDiagnosticsRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private StartDiagnosticsRequest() { + pushSensors_ = false; + pushMotors_ = false; + pushLogs_ = false; + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private StartDiagnosticsRequest( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 8: { + + pushSensors_ = input.readBool(); + break; + } + case 16: { + + pushMotors_ = input.readBool(); + break; + } + case 24: { + + pushLogs_ = input.readBool(); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.internal_static_Tango_PMR_Diagnostics_StartDiagnosticsRequest_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.internal_static_Tango_PMR_Diagnostics_StartDiagnosticsRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequest.class, com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequest.Builder.class); + } + + public static final int PUSHSENSORS_FIELD_NUMBER = 1; + private boolean pushSensors_; + /** + * bool PushSensors = 1; + */ + public boolean getPushSensors() { + return pushSensors_; + } + + public static final int PUSHMOTORS_FIELD_NUMBER = 2; + private boolean pushMotors_; + /** + * bool PushMotors = 2; + */ + public boolean getPushMotors() { + return pushMotors_; + } + + public static final int PUSHLOGS_FIELD_NUMBER = 3; + private boolean pushLogs_; + /** + * bool PushLogs = 3; + */ + public boolean getPushLogs() { + return pushLogs_; + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (pushSensors_ != false) { + output.writeBool(1, pushSensors_); + } + if (pushMotors_ != false) { + output.writeBool(2, pushMotors_); + } + if (pushLogs_ != false) { + output.writeBool(3, pushLogs_); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (pushSensors_ != false) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(1, pushSensors_); + } + if (pushMotors_ != false) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(2, pushMotors_); + } + if (pushLogs_ != false) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(3, pushLogs_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequest)) { + return super.equals(obj); + } + com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequest other = (com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequest) obj; + + boolean result = true; + result = result && (getPushSensors() + == other.getPushSensors()); + result = result && (getPushMotors() + == other.getPushMotors()); + result = result && (getPushLogs() + == other.getPushLogs()); + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + PUSHSENSORS_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getPushSensors()); + hash = (37 * hash) + PUSHMOTORS_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getPushMotors()); + hash = (37 * hash) + PUSHLOGS_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getPushLogs()); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequest parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequest parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequest parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequest parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequest parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequest parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequest parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequest parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequest parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequest parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequest parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequest parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequest prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code Tango.PMR.Diagnostics.StartDiagnosticsRequest} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:Tango.PMR.Diagnostics.StartDiagnosticsRequest) + com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequestOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.internal_static_Tango_PMR_Diagnostics_StartDiagnosticsRequest_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.internal_static_Tango_PMR_Diagnostics_StartDiagnosticsRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequest.class, com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequest.Builder.class); + } + + // Construct using com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequest.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + public Builder clear() { + super.clear(); + pushSensors_ = false; + + pushMotors_ = false; + + pushLogs_ = false; + + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.internal_static_Tango_PMR_Diagnostics_StartDiagnosticsRequest_descriptor; + } + + public com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequest getDefaultInstanceForType() { + return com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequest.getDefaultInstance(); + } + + public com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequest build() { + com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequest result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequest buildPartial() { + com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequest result = new com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequest(this); + result.pushSensors_ = pushSensors_; + result.pushMotors_ = pushMotors_; + result.pushLogs_ = pushLogs_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequest) { + return mergeFrom((com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequest)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequest other) { + if (other == com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequest.getDefaultInstance()) return this; + if (other.getPushSensors() != false) { + setPushSensors(other.getPushSensors()); + } + if (other.getPushMotors() != false) { + setPushMotors(other.getPushMotors()); + } + if (other.getPushLogs() != false) { + setPushLogs(other.getPushLogs()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequest parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequest) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private boolean pushSensors_ ; + /** + * bool PushSensors = 1; + */ + public boolean getPushSensors() { + return pushSensors_; + } + /** + * bool PushSensors = 1; + */ + public Builder setPushSensors(boolean value) { + + pushSensors_ = value; + onChanged(); + return this; + } + /** + * bool PushSensors = 1; + */ + public Builder clearPushSensors() { + + pushSensors_ = false; + onChanged(); + return this; + } + + private boolean pushMotors_ ; + /** + * bool PushMotors = 2; + */ + public boolean getPushMotors() { + return pushMotors_; + } + /** + * bool PushMotors = 2; + */ + public Builder setPushMotors(boolean value) { + + pushMotors_ = value; + onChanged(); + return this; + } + /** + * bool PushMotors = 2; + */ + public Builder clearPushMotors() { + + pushMotors_ = false; + onChanged(); + return this; + } + + private boolean pushLogs_ ; + /** + * bool PushLogs = 3; + */ + public boolean getPushLogs() { + return pushLogs_; + } + /** + * bool PushLogs = 3; + */ + public Builder setPushLogs(boolean value) { + + pushLogs_ = value; + onChanged(); + return this; + } + /** + * bool PushLogs = 3; + */ + public Builder clearPushLogs() { + + pushLogs_ = false; + onChanged(); + return this; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:Tango.PMR.Diagnostics.StartDiagnosticsRequest) + } + + // @@protoc_insertion_point(class_scope:Tango.PMR.Diagnostics.StartDiagnosticsRequest) + private static final com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequest DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequest(); + } + + public static com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequest getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public StartDiagnosticsRequest parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new StartDiagnosticsRequest(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.twine.tango.pmr.diagnostics.StartDiagnosticsRequestOuterClass.StartDiagnosticsRequest getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_Tango_PMR_Diagnostics_StartDiagnosticsRequest_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_Tango_PMR_Diagnostics_StartDiagnosticsRequest_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n\035StartDiagnosticsRequest.proto\022\025Tango.P" + + "MR.Diagnostics\"T\n\027StartDiagnosticsReques" + + "t\022\023\n\013PushSensors\030\001 \001(\010\022\022\n\nPushMotors\030\002 \001" + + "(\010\022\020\n\010PushLogs\030\003 \001(\010B!\n\037com.twine.tango." + + "pmr.diagnosticsb\006proto3" + }; + com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = + new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { + public com.google.protobuf.ExtensionRegistry assignDescriptors( + com.google.protobuf.Descriptors.FileDescriptor root) { + descriptor = root; + return null; + } + }; + com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + }, assigner); + internal_static_Tango_PMR_Diagnostics_StartDiagnosticsRequest_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_Tango_PMR_Diagnostics_StartDiagnosticsRequest_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_Tango_PMR_Diagnostics_StartDiagnosticsRequest_descriptor, + new java.lang.String[] { "PushSensors", "PushMotors", "PushLogs", }); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/StartDiagnosticsResponseOuterClass.java b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/StartDiagnosticsResponseOuterClass.java new file mode 100644 index 000000000..fa5b736e1 --- /dev/null +++ b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/diagnostics/StartDiagnosticsResponseOuterClass.java @@ -0,0 +1,782 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: StartDiagnosticsResponse.proto + +package com.twine.tango.pmr.diagnostics; + +public final class StartDiagnosticsResponseOuterClass { + private StartDiagnosticsResponseOuterClass() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); + } + public interface StartDiagnosticsResponseOrBuilder extends + // @@protoc_insertion_point(interface_extends:Tango.PMR.Diagnostics.StartDiagnosticsResponse) + com.google.protobuf.MessageOrBuilder { + + /** + * repeated double Temperature = 1; + */ + java.util.List getTemperatureList(); + /** + * repeated double Temperature = 1; + */ + int getTemperatureCount(); + /** + * repeated double Temperature = 1; + */ + double getTemperature(int index); + + /** + * repeated double Velocity = 2; + */ + java.util.List getVelocityList(); + /** + * repeated double Velocity = 2; + */ + int getVelocityCount(); + /** + * repeated double Velocity = 2; + */ + double getVelocity(int index); + } + /** + * Protobuf type {@code Tango.PMR.Diagnostics.StartDiagnosticsResponse} + */ + public static final class StartDiagnosticsResponse extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:Tango.PMR.Diagnostics.StartDiagnosticsResponse) + StartDiagnosticsResponseOrBuilder { + private static final long serialVersionUID = 0L; + // Use StartDiagnosticsResponse.newBuilder() to construct. + private StartDiagnosticsResponse(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private StartDiagnosticsResponse() { + temperature_ = java.util.Collections.emptyList(); + velocity_ = java.util.Collections.emptyList(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private StartDiagnosticsResponse( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 9: { + if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + temperature_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; + } + temperature_.add(input.readDouble()); + break; + } + case 10: { + int length = input.readRawVarint32(); + int limit = input.pushLimit(length); + if (!((mutable_bitField0_ & 0x00000001) == 0x00000001) && input.getBytesUntilLimit() > 0) { + temperature_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; + } + while (input.getBytesUntilLimit() > 0) { + temperature_.add(input.readDouble()); + } + input.popLimit(limit); + break; + } + case 17: { + if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + velocity_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000002; + } + velocity_.add(input.readDouble()); + break; + } + case 18: { + int length = input.readRawVarint32(); + int limit = input.pushLimit(length); + if (!((mutable_bitField0_ & 0x00000002) == 0x00000002) && input.getBytesUntilLimit() > 0) { + velocity_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000002; + } + while (input.getBytesUntilLimit() > 0) { + velocity_.add(input.readDouble()); + } + input.popLimit(limit); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + temperature_ = java.util.Collections.unmodifiableList(temperature_); + } + if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + velocity_ = java.util.Collections.unmodifiableList(velocity_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.internal_static_Tango_PMR_Diagnostics_StartDiagnosticsResponse_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.internal_static_Tango_PMR_Diagnostics_StartDiagnosticsResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponse.class, com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponse.Builder.class); + } + + public static final int TEMPERATURE_FIELD_NUMBER = 1; + private java.util.List temperature_; + /** + * repeated double Temperature = 1; + */ + public java.util.List + getTemperatureList() { + return temperature_; + } + /** + * repeated double Temperature = 1; + */ + public int getTemperatureCount() { + return temperature_.size(); + } + /** + * repeated double Temperature = 1; + */ + public double getTemperature(int index) { + return temperature_.get(index); + } + private int temperatureMemoizedSerializedSize = -1; + + public static final int VELOCITY_FIELD_NUMBER = 2; + private java.util.List velocity_; + /** + * repeated double Velocity = 2; + */ + public java.util.List + getVelocityList() { + return velocity_; + } + /** + * repeated double Velocity = 2; + */ + public int getVelocityCount() { + return velocity_.size(); + } + /** + * repeated double Velocity = 2; + */ + public double getVelocity(int index) { + return velocity_.get(index); + } + private int velocityMemoizedSerializedSize = -1; + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + if (getTemperatureList().size() > 0) { + output.writeUInt32NoTag(10); + output.writeUInt32NoTag(temperatureMemoizedSerializedSize); + } + for (int i = 0; i < temperature_.size(); i++) { + output.writeDoubleNoTag(temperature_.get(i)); + } + if (getVelocityList().size() > 0) { + output.writeUInt32NoTag(18); + output.writeUInt32NoTag(velocityMemoizedSerializedSize); + } + for (int i = 0; i < velocity_.size(); i++) { + output.writeDoubleNoTag(velocity_.get(i)); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + { + int dataSize = 0; + dataSize = 8 * getTemperatureList().size(); + size += dataSize; + if (!getTemperatureList().isEmpty()) { + size += 1; + size += com.google.protobuf.CodedOutputStream + .computeInt32SizeNoTag(dataSize); + } + temperatureMemoizedSerializedSize = dataSize; + } + { + int dataSize = 0; + dataSize = 8 * getVelocityList().size(); + size += dataSize; + if (!getVelocityList().isEmpty()) { + size += 1; + size += com.google.protobuf.CodedOutputStream + .computeInt32SizeNoTag(dataSize); + } + velocityMemoizedSerializedSize = dataSize; + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponse)) { + return super.equals(obj); + } + com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponse other = (com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponse) obj; + + boolean result = true; + result = result && getTemperatureList() + .equals(other.getTemperatureList()); + result = result && getVelocityList() + .equals(other.getVelocityList()); + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (getTemperatureCount() > 0) { + hash = (37 * hash) + TEMPERATURE_FIELD_NUMBER; + hash = (53 * hash) + getTemperatureList().hashCode(); + } + if (getVelocityCount() > 0) { + hash = (37 * hash) + VELOCITY_FIELD_NUMBER; + hash = (53 * hash) + getVelocityList().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponse parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponse parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponse parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponse parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponse parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponse parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponse parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponse parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponse parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponse parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponse parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponse parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponse prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code Tango.PMR.Diagnostics.StartDiagnosticsResponse} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:Tango.PMR.Diagnostics.StartDiagnosticsResponse) + com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponseOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.internal_static_Tango_PMR_Diagnostics_StartDiagnosticsResponse_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.internal_static_Tango_PMR_Diagnostics_StartDiagnosticsResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponse.class, com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponse.Builder.class); + } + + // Construct using com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponse.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + public Builder clear() { + super.clear(); + temperature_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + velocity_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000002); + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.internal_static_Tango_PMR_Diagnostics_StartDiagnosticsResponse_descriptor; + } + + public com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponse getDefaultInstanceForType() { + return com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponse.getDefaultInstance(); + } + + public com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponse build() { + com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponse result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponse buildPartial() { + com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponse result = new com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponse(this); + int from_bitField0_ = bitField0_; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + temperature_ = java.util.Collections.unmodifiableList(temperature_); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.temperature_ = temperature_; + if (((bitField0_ & 0x00000002) == 0x00000002)) { + velocity_ = java.util.Collections.unmodifiableList(velocity_); + bitField0_ = (bitField0_ & ~0x00000002); + } + result.velocity_ = velocity_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponse) { + return mergeFrom((com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponse)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponse other) { + if (other == com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponse.getDefaultInstance()) return this; + if (!other.temperature_.isEmpty()) { + if (temperature_.isEmpty()) { + temperature_ = other.temperature_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureTemperatureIsMutable(); + temperature_.addAll(other.temperature_); + } + onChanged(); + } + if (!other.velocity_.isEmpty()) { + if (velocity_.isEmpty()) { + velocity_ = other.velocity_; + bitField0_ = (bitField0_ & ~0x00000002); + } else { + ensureVelocityIsMutable(); + velocity_.addAll(other.velocity_); + } + onChanged(); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponse parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponse) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + private java.util.List temperature_ = java.util.Collections.emptyList(); + private void ensureTemperatureIsMutable() { + if (!((bitField0_ & 0x00000001) == 0x00000001)) { + temperature_ = new java.util.ArrayList(temperature_); + bitField0_ |= 0x00000001; + } + } + /** + * repeated double Temperature = 1; + */ + public java.util.List + getTemperatureList() { + return java.util.Collections.unmodifiableList(temperature_); + } + /** + * repeated double Temperature = 1; + */ + public int getTemperatureCount() { + return temperature_.size(); + } + /** + * repeated double Temperature = 1; + */ + public double getTemperature(int index) { + return temperature_.get(index); + } + /** + * repeated double Temperature = 1; + */ + public Builder setTemperature( + int index, double value) { + ensureTemperatureIsMutable(); + temperature_.set(index, value); + onChanged(); + return this; + } + /** + * repeated double Temperature = 1; + */ + public Builder addTemperature(double value) { + ensureTemperatureIsMutable(); + temperature_.add(value); + onChanged(); + return this; + } + /** + * repeated double Temperature = 1; + */ + public Builder addAllTemperature( + java.lang.Iterable values) { + ensureTemperatureIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, temperature_); + onChanged(); + return this; + } + /** + * repeated double Temperature = 1; + */ + public Builder clearTemperature() { + temperature_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + return this; + } + + private java.util.List velocity_ = java.util.Collections.emptyList(); + private void ensureVelocityIsMutable() { + if (!((bitField0_ & 0x00000002) == 0x00000002)) { + velocity_ = new java.util.ArrayList(velocity_); + bitField0_ |= 0x00000002; + } + } + /** + * repeated double Velocity = 2; + */ + public java.util.List + getVelocityList() { + return java.util.Collections.unmodifiableList(velocity_); + } + /** + * repeated double Velocity = 2; + */ + public int getVelocityCount() { + return velocity_.size(); + } + /** + * repeated double Velocity = 2; + */ + public double getVelocity(int index) { + return velocity_.get(index); + } + /** + * repeated double Velocity = 2; + */ + public Builder setVelocity( + int index, double value) { + ensureVelocityIsMutable(); + velocity_.set(index, value); + onChanged(); + return this; + } + /** + * repeated double Velocity = 2; + */ + public Builder addVelocity(double value) { + ensureVelocityIsMutable(); + velocity_.add(value); + onChanged(); + return this; + } + /** + * repeated double Velocity = 2; + */ + public Builder addAllVelocity( + java.lang.Iterable values) { + ensureVelocityIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, velocity_); + onChanged(); + return this; + } + /** + * repeated double Velocity = 2; + */ + public Builder clearVelocity() { + velocity_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000002); + onChanged(); + return this; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:Tango.PMR.Diagnostics.StartDiagnosticsResponse) + } + + // @@protoc_insertion_point(class_scope:Tango.PMR.Diagnostics.StartDiagnosticsResponse) + private static final com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponse DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponse(); + } + + public static com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponse getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public StartDiagnosticsResponse parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new StartDiagnosticsResponse(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.twine.tango.pmr.diagnostics.StartDiagnosticsResponseOuterClass.StartDiagnosticsResponse getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_Tango_PMR_Diagnostics_StartDiagnosticsResponse_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_Tango_PMR_Diagnostics_StartDiagnosticsResponse_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n\036StartDiagnosticsResponse.proto\022\025Tango." + + "PMR.Diagnostics\"A\n\030StartDiagnosticsRespo" + + "nse\022\023\n\013Temperature\030\001 \003(\001\022\020\n\010Velocity\030\002 \003" + + "(\001B!\n\037com.twine.tango.pmr.diagnosticsb\006p" + + "roto3" + }; + com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = + new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { + public com.google.protobuf.ExtensionRegistry assignDescriptors( + com.google.protobuf.Descriptors.FileDescriptor root) { + descriptor = root; + return null; + } + }; + com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + }, assigner); + internal_static_Tango_PMR_Diagnostics_StartDiagnosticsResponse_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_Tango_PMR_Diagnostics_StartDiagnosticsResponse_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_Tango_PMR_Diagnostics_StartDiagnosticsResponse_descriptor, + new java.lang.String[] { "Temperature", "Velocity", }); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/jobs/Dispenser.java b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/jobs/Dispenser.java new file mode 100644 index 000000000..e1193c8d3 --- /dev/null +++ b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/jobs/Dispenser.java @@ -0,0 +1,1406 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: dispenser.proto + +package com.twine.tango.pmr.jobs; + +public final class Dispenser { + private Dispenser() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); + } + public interface gradientFlowOrBuilder extends + // @@protoc_insertion_point(interface_extends:Tango.PMR.Jobs.gradientFlow) + com.google.protobuf.MessageOrBuilder { + + /** + * double NLflow = 1; + */ + double getNLflow(); + } + /** + * Protobuf type {@code Tango.PMR.Jobs.gradientFlow} + */ + public static final class gradientFlow extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:Tango.PMR.Jobs.gradientFlow) + gradientFlowOrBuilder { + private static final long serialVersionUID = 0L; + // Use gradientFlow.newBuilder() to construct. + private gradientFlow(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private gradientFlow() { + nLflow_ = 0D; + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private gradientFlow( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 9: { + + nLflow_ = input.readDouble(); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.twine.tango.pmr.jobs.Dispenser.internal_static_Tango_PMR_Jobs_gradientFlow_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.twine.tango.pmr.jobs.Dispenser.internal_static_Tango_PMR_Jobs_gradientFlow_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.twine.tango.pmr.jobs.Dispenser.gradientFlow.class, com.twine.tango.pmr.jobs.Dispenser.gradientFlow.Builder.class); + } + + public static final int NLFLOW_FIELD_NUMBER = 1; + private double nLflow_; + /** + * double NLflow = 1; + */ + public double getNLflow() { + return nLflow_; + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (nLflow_ != 0D) { + output.writeDouble(1, nLflow_); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (nLflow_ != 0D) { + size += com.google.protobuf.CodedOutputStream + .computeDoubleSize(1, nLflow_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.twine.tango.pmr.jobs.Dispenser.gradientFlow)) { + return super.equals(obj); + } + com.twine.tango.pmr.jobs.Dispenser.gradientFlow other = (com.twine.tango.pmr.jobs.Dispenser.gradientFlow) obj; + + boolean result = true; + result = result && ( + java.lang.Double.doubleToLongBits(getNLflow()) + == java.lang.Double.doubleToLongBits( + other.getNLflow())); + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + NLFLOW_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + java.lang.Double.doubleToLongBits(getNLflow())); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.twine.tango.pmr.jobs.Dispenser.gradientFlow parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.twine.tango.pmr.jobs.Dispenser.gradientFlow parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.twine.tango.pmr.jobs.Dispenser.gradientFlow parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.twine.tango.pmr.jobs.Dispenser.gradientFlow parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.twine.tango.pmr.jobs.Dispenser.gradientFlow parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.twine.tango.pmr.jobs.Dispenser.gradientFlow parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.twine.tango.pmr.jobs.Dispenser.gradientFlow parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.twine.tango.pmr.jobs.Dispenser.gradientFlow parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.twine.tango.pmr.jobs.Dispenser.gradientFlow parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.twine.tango.pmr.jobs.Dispenser.gradientFlow parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.twine.tango.pmr.jobs.Dispenser.gradientFlow parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.twine.tango.pmr.jobs.Dispenser.gradientFlow parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.twine.tango.pmr.jobs.Dispenser.gradientFlow prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code Tango.PMR.Jobs.gradientFlow} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:Tango.PMR.Jobs.gradientFlow) + com.twine.tango.pmr.jobs.Dispenser.gradientFlowOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.twine.tango.pmr.jobs.Dispenser.internal_static_Tango_PMR_Jobs_gradientFlow_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.twine.tango.pmr.jobs.Dispenser.internal_static_Tango_PMR_Jobs_gradientFlow_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.twine.tango.pmr.jobs.Dispenser.gradientFlow.class, com.twine.tango.pmr.jobs.Dispenser.gradientFlow.Builder.class); + } + + // Construct using com.twine.tango.pmr.jobs.Dispenser.gradientFlow.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + public Builder clear() { + super.clear(); + nLflow_ = 0D; + + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.twine.tango.pmr.jobs.Dispenser.internal_static_Tango_PMR_Jobs_gradientFlow_descriptor; + } + + public com.twine.tango.pmr.jobs.Dispenser.gradientFlow getDefaultInstanceForType() { + return com.twine.tango.pmr.jobs.Dispenser.gradientFlow.getDefaultInstance(); + } + + public com.twine.tango.pmr.jobs.Dispenser.gradientFlow build() { + com.twine.tango.pmr.jobs.Dispenser.gradientFlow result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.twine.tango.pmr.jobs.Dispenser.gradientFlow buildPartial() { + com.twine.tango.pmr.jobs.Dispenser.gradientFlow result = new com.twine.tango.pmr.jobs.Dispenser.gradientFlow(this); + result.nLflow_ = nLflow_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.twine.tango.pmr.jobs.Dispenser.gradientFlow) { + return mergeFrom((com.twine.tango.pmr.jobs.Dispenser.gradientFlow)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.twine.tango.pmr.jobs.Dispenser.gradientFlow other) { + if (other == com.twine.tango.pmr.jobs.Dispenser.gradientFlow.getDefaultInstance()) return this; + if (other.getNLflow() != 0D) { + setNLflow(other.getNLflow()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.twine.tango.pmr.jobs.Dispenser.gradientFlow parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.twine.tango.pmr.jobs.Dispenser.gradientFlow) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private double nLflow_ ; + /** + * double NLflow = 1; + */ + public double getNLflow() { + return nLflow_; + } + /** + * double NLflow = 1; + */ + public Builder setNLflow(double value) { + + nLflow_ = value; + onChanged(); + return this; + } + /** + * double NLflow = 1; + */ + public Builder clearNLflow() { + + nLflow_ = 0D; + onChanged(); + return this; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:Tango.PMR.Jobs.gradientFlow) + } + + // @@protoc_insertion_point(class_scope:Tango.PMR.Jobs.gradientFlow) + private static final com.twine.tango.pmr.jobs.Dispenser.gradientFlow DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.twine.tango.pmr.jobs.Dispenser.gradientFlow(); + } + + public static com.twine.tango.pmr.jobs.Dispenser.gradientFlow getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public gradientFlow parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new gradientFlow(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.twine.tango.pmr.jobs.Dispenser.gradientFlow getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + public interface DispenseOrBuilder extends + // @@protoc_insertion_point(interface_extends:Tango.PMR.Jobs.Dispense) + com.google.protobuf.MessageOrBuilder { + + /** + * int32 Id = 1; + */ + int getId(); + + /** + * double startFlow = 2; + */ + double getStartFlow(); + + /** + * repeated .Tango.PMR.Jobs.gradientFlow gradient = 3; + */ + java.util.List + getGradientList(); + /** + * repeated .Tango.PMR.Jobs.gradientFlow gradient = 3; + */ + com.twine.tango.pmr.jobs.Dispenser.gradientFlow getGradient(int index); + /** + * repeated .Tango.PMR.Jobs.gradientFlow gradient = 3; + */ + int getGradientCount(); + /** + * repeated .Tango.PMR.Jobs.gradientFlow gradient = 3; + */ + java.util.List + getGradientOrBuilderList(); + /** + * repeated .Tango.PMR.Jobs.gradientFlow gradient = 3; + */ + com.twine.tango.pmr.jobs.Dispenser.gradientFlowOrBuilder getGradientOrBuilder( + int index); + } + /** + * Protobuf type {@code Tango.PMR.Jobs.Dispense} + */ + public static final class Dispense extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:Tango.PMR.Jobs.Dispense) + DispenseOrBuilder { + private static final long serialVersionUID = 0L; + // Use Dispense.newBuilder() to construct. + private Dispense(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private Dispense() { + id_ = 0; + startFlow_ = 0D; + gradient_ = java.util.Collections.emptyList(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private Dispense( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 8: { + + id_ = input.readInt32(); + break; + } + case 17: { + + startFlow_ = input.readDouble(); + break; + } + case 26: { + if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + gradient_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000004; + } + gradient_.add( + input.readMessage(com.twine.tango.pmr.jobs.Dispenser.gradientFlow.parser(), extensionRegistry)); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + gradient_ = java.util.Collections.unmodifiableList(gradient_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.twine.tango.pmr.jobs.Dispenser.internal_static_Tango_PMR_Jobs_Dispense_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.twine.tango.pmr.jobs.Dispenser.internal_static_Tango_PMR_Jobs_Dispense_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.twine.tango.pmr.jobs.Dispenser.Dispense.class, com.twine.tango.pmr.jobs.Dispenser.Dispense.Builder.class); + } + + private int bitField0_; + public static final int ID_FIELD_NUMBER = 1; + private int id_; + /** + * int32 Id = 1; + */ + public int getId() { + return id_; + } + + public static final int STARTFLOW_FIELD_NUMBER = 2; + private double startFlow_; + /** + * double startFlow = 2; + */ + public double getStartFlow() { + return startFlow_; + } + + public static final int GRADIENT_FIELD_NUMBER = 3; + private java.util.List gradient_; + /** + * repeated .Tango.PMR.Jobs.gradientFlow gradient = 3; + */ + public java.util.List getGradientList() { + return gradient_; + } + /** + * repeated .Tango.PMR.Jobs.gradientFlow gradient = 3; + */ + public java.util.List + getGradientOrBuilderList() { + return gradient_; + } + /** + * repeated .Tango.PMR.Jobs.gradientFlow gradient = 3; + */ + public int getGradientCount() { + return gradient_.size(); + } + /** + * repeated .Tango.PMR.Jobs.gradientFlow gradient = 3; + */ + public com.twine.tango.pmr.jobs.Dispenser.gradientFlow getGradient(int index) { + return gradient_.get(index); + } + /** + * repeated .Tango.PMR.Jobs.gradientFlow gradient = 3; + */ + public com.twine.tango.pmr.jobs.Dispenser.gradientFlowOrBuilder getGradientOrBuilder( + int index) { + return gradient_.get(index); + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (id_ != 0) { + output.writeInt32(1, id_); + } + if (startFlow_ != 0D) { + output.writeDouble(2, startFlow_); + } + for (int i = 0; i < gradient_.size(); i++) { + output.writeMessage(3, gradient_.get(i)); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (id_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(1, id_); + } + if (startFlow_ != 0D) { + size += com.google.protobuf.CodedOutputStream + .computeDoubleSize(2, startFlow_); + } + for (int i = 0; i < gradient_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(3, gradient_.get(i)); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.twine.tango.pmr.jobs.Dispenser.Dispense)) { + return super.equals(obj); + } + com.twine.tango.pmr.jobs.Dispenser.Dispense other = (com.twine.tango.pmr.jobs.Dispenser.Dispense) obj; + + boolean result = true; + result = result && (getId() + == other.getId()); + result = result && ( + java.lang.Double.doubleToLongBits(getStartFlow()) + == java.lang.Double.doubleToLongBits( + other.getStartFlow())); + result = result && getGradientList() + .equals(other.getGradientList()); + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + ID_FIELD_NUMBER; + hash = (53 * hash) + getId(); + hash = (37 * hash) + STARTFLOW_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + java.lang.Double.doubleToLongBits(getStartFlow())); + if (getGradientCount() > 0) { + hash = (37 * hash) + GRADIENT_FIELD_NUMBER; + hash = (53 * hash) + getGradientList().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.twine.tango.pmr.jobs.Dispenser.Dispense parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.twine.tango.pmr.jobs.Dispenser.Dispense parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.twine.tango.pmr.jobs.Dispenser.Dispense parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.twine.tango.pmr.jobs.Dispenser.Dispense parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.twine.tango.pmr.jobs.Dispenser.Dispense parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.twine.tango.pmr.jobs.Dispenser.Dispense parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.twine.tango.pmr.jobs.Dispenser.Dispense parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.twine.tango.pmr.jobs.Dispenser.Dispense parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.twine.tango.pmr.jobs.Dispenser.Dispense parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.twine.tango.pmr.jobs.Dispenser.Dispense parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.twine.tango.pmr.jobs.Dispenser.Dispense parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.twine.tango.pmr.jobs.Dispenser.Dispense parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.twine.tango.pmr.jobs.Dispenser.Dispense prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code Tango.PMR.Jobs.Dispense} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:Tango.PMR.Jobs.Dispense) + com.twine.tango.pmr.jobs.Dispenser.DispenseOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.twine.tango.pmr.jobs.Dispenser.internal_static_Tango_PMR_Jobs_Dispense_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.twine.tango.pmr.jobs.Dispenser.internal_static_Tango_PMR_Jobs_Dispense_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.twine.tango.pmr.jobs.Dispenser.Dispense.class, com.twine.tango.pmr.jobs.Dispenser.Dispense.Builder.class); + } + + // Construct using com.twine.tango.pmr.jobs.Dispenser.Dispense.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + getGradientFieldBuilder(); + } + } + public Builder clear() { + super.clear(); + id_ = 0; + + startFlow_ = 0D; + + if (gradientBuilder_ == null) { + gradient_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000004); + } else { + gradientBuilder_.clear(); + } + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.twine.tango.pmr.jobs.Dispenser.internal_static_Tango_PMR_Jobs_Dispense_descriptor; + } + + public com.twine.tango.pmr.jobs.Dispenser.Dispense getDefaultInstanceForType() { + return com.twine.tango.pmr.jobs.Dispenser.Dispense.getDefaultInstance(); + } + + public com.twine.tango.pmr.jobs.Dispenser.Dispense build() { + com.twine.tango.pmr.jobs.Dispenser.Dispense result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.twine.tango.pmr.jobs.Dispenser.Dispense buildPartial() { + com.twine.tango.pmr.jobs.Dispenser.Dispense result = new com.twine.tango.pmr.jobs.Dispenser.Dispense(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + result.id_ = id_; + result.startFlow_ = startFlow_; + if (gradientBuilder_ == null) { + if (((bitField0_ & 0x00000004) == 0x00000004)) { + gradient_ = java.util.Collections.unmodifiableList(gradient_); + bitField0_ = (bitField0_ & ~0x00000004); + } + result.gradient_ = gradient_; + } else { + result.gradient_ = gradientBuilder_.build(); + } + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.twine.tango.pmr.jobs.Dispenser.Dispense) { + return mergeFrom((com.twine.tango.pmr.jobs.Dispenser.Dispense)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.twine.tango.pmr.jobs.Dispenser.Dispense other) { + if (other == com.twine.tango.pmr.jobs.Dispenser.Dispense.getDefaultInstance()) return this; + if (other.getId() != 0) { + setId(other.getId()); + } + if (other.getStartFlow() != 0D) { + setStartFlow(other.getStartFlow()); + } + if (gradientBuilder_ == null) { + if (!other.gradient_.isEmpty()) { + if (gradient_.isEmpty()) { + gradient_ = other.gradient_; + bitField0_ = (bitField0_ & ~0x00000004); + } else { + ensureGradientIsMutable(); + gradient_.addAll(other.gradient_); + } + onChanged(); + } + } else { + if (!other.gradient_.isEmpty()) { + if (gradientBuilder_.isEmpty()) { + gradientBuilder_.dispose(); + gradientBuilder_ = null; + gradient_ = other.gradient_; + bitField0_ = (bitField0_ & ~0x00000004); + gradientBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getGradientFieldBuilder() : null; + } else { + gradientBuilder_.addAllMessages(other.gradient_); + } + } + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.twine.tango.pmr.jobs.Dispenser.Dispense parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.twine.tango.pmr.jobs.Dispenser.Dispense) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + private int id_ ; + /** + * int32 Id = 1; + */ + public int getId() { + return id_; + } + /** + * int32 Id = 1; + */ + public Builder setId(int value) { + + id_ = value; + onChanged(); + return this; + } + /** + * int32 Id = 1; + */ + public Builder clearId() { + + id_ = 0; + onChanged(); + return this; + } + + private double startFlow_ ; + /** + * double startFlow = 2; + */ + public double getStartFlow() { + return startFlow_; + } + /** + * double startFlow = 2; + */ + public Builder setStartFlow(double value) { + + startFlow_ = value; + onChanged(); + return this; + } + /** + * double startFlow = 2; + */ + public Builder clearStartFlow() { + + startFlow_ = 0D; + onChanged(); + return this; + } + + private java.util.List gradient_ = + java.util.Collections.emptyList(); + private void ensureGradientIsMutable() { + if (!((bitField0_ & 0x00000004) == 0x00000004)) { + gradient_ = new java.util.ArrayList(gradient_); + bitField0_ |= 0x00000004; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + com.twine.tango.pmr.jobs.Dispenser.gradientFlow, com.twine.tango.pmr.jobs.Dispenser.gradientFlow.Builder, com.twine.tango.pmr.jobs.Dispenser.gradientFlowOrBuilder> gradientBuilder_; + + /** + * repeated .Tango.PMR.Jobs.gradientFlow gradient = 3; + */ + public java.util.List getGradientList() { + if (gradientBuilder_ == null) { + return java.util.Collections.unmodifiableList(gradient_); + } else { + return gradientBuilder_.getMessageList(); + } + } + /** + * repeated .Tango.PMR.Jobs.gradientFlow gradient = 3; + */ + public int getGradientCount() { + if (gradientBuilder_ == null) { + return gradient_.size(); + } else { + return gradientBuilder_.getCount(); + } + } + /** + * repeated .Tango.PMR.Jobs.gradientFlow gradient = 3; + */ + public com.twine.tango.pmr.jobs.Dispenser.gradientFlow getGradient(int index) { + if (gradientBuilder_ == null) { + return gradient_.get(index); + } else { + return gradientBuilder_.getMessage(index); + } + } + /** + * repeated .Tango.PMR.Jobs.gradientFlow gradient = 3; + */ + public Builder setGradient( + int index, com.twine.tango.pmr.jobs.Dispenser.gradientFlow value) { + if (gradientBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureGradientIsMutable(); + gradient_.set(index, value); + onChanged(); + } else { + gradientBuilder_.setMessage(index, value); + } + return this; + } + /** + * repeated .Tango.PMR.Jobs.gradientFlow gradient = 3; + */ + public Builder setGradient( + int index, com.twine.tango.pmr.jobs.Dispenser.gradientFlow.Builder builderForValue) { + if (gradientBuilder_ == null) { + ensureGradientIsMutable(); + gradient_.set(index, builderForValue.build()); + onChanged(); + } else { + gradientBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .Tango.PMR.Jobs.gradientFlow gradient = 3; + */ + public Builder addGradient(com.twine.tango.pmr.jobs.Dispenser.gradientFlow value) { + if (gradientBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureGradientIsMutable(); + gradient_.add(value); + onChanged(); + } else { + gradientBuilder_.addMessage(value); + } + return this; + } + /** + * repeated .Tango.PMR.Jobs.gradientFlow gradient = 3; + */ + public Builder addGradient( + int index, com.twine.tango.pmr.jobs.Dispenser.gradientFlow value) { + if (gradientBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureGradientIsMutable(); + gradient_.add(index, value); + onChanged(); + } else { + gradientBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .Tango.PMR.Jobs.gradientFlow gradient = 3; + */ + public Builder addGradient( + com.twine.tango.pmr.jobs.Dispenser.gradientFlow.Builder builderForValue) { + if (gradientBuilder_ == null) { + ensureGradientIsMutable(); + gradient_.add(builderForValue.build()); + onChanged(); + } else { + gradientBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .Tango.PMR.Jobs.gradientFlow gradient = 3; + */ + public Builder addGradient( + int index, com.twine.tango.pmr.jobs.Dispenser.gradientFlow.Builder builderForValue) { + if (gradientBuilder_ == null) { + ensureGradientIsMutable(); + gradient_.add(index, builderForValue.build()); + onChanged(); + } else { + gradientBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .Tango.PMR.Jobs.gradientFlow gradient = 3; + */ + public Builder addAllGradient( + java.lang.Iterable values) { + if (gradientBuilder_ == null) { + ensureGradientIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, gradient_); + onChanged(); + } else { + gradientBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .Tango.PMR.Jobs.gradientFlow gradient = 3; + */ + public Builder clearGradient() { + if (gradientBuilder_ == null) { + gradient_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000004); + onChanged(); + } else { + gradientBuilder_.clear(); + } + return this; + } + /** + * repeated .Tango.PMR.Jobs.gradientFlow gradient = 3; + */ + public Builder removeGradient(int index) { + if (gradientBuilder_ == null) { + ensureGradientIsMutable(); + gradient_.remove(index); + onChanged(); + } else { + gradientBuilder_.remove(index); + } + return this; + } + /** + * repeated .Tango.PMR.Jobs.gradientFlow gradient = 3; + */ + public com.twine.tango.pmr.jobs.Dispenser.gradientFlow.Builder getGradientBuilder( + int index) { + return getGradientFieldBuilder().getBuilder(index); + } + /** + * repeated .Tango.PMR.Jobs.gradientFlow gradient = 3; + */ + public com.twine.tango.pmr.jobs.Dispenser.gradientFlowOrBuilder getGradientOrBuilder( + int index) { + if (gradientBuilder_ == null) { + return gradient_.get(index); } else { + return gradientBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .Tango.PMR.Jobs.gradientFlow gradient = 3; + */ + public java.util.List + getGradientOrBuilderList() { + if (gradientBuilder_ != null) { + return gradientBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(gradient_); + } + } + /** + * repeated .Tango.PMR.Jobs.gradientFlow gradient = 3; + */ + public com.twine.tango.pmr.jobs.Dispenser.gradientFlow.Builder addGradientBuilder() { + return getGradientFieldBuilder().addBuilder( + com.twine.tango.pmr.jobs.Dispenser.gradientFlow.getDefaultInstance()); + } + /** + * repeated .Tango.PMR.Jobs.gradientFlow gradient = 3; + */ + public com.twine.tango.pmr.jobs.Dispenser.gradientFlow.Builder addGradientBuilder( + int index) { + return getGradientFieldBuilder().addBuilder( + index, com.twine.tango.pmr.jobs.Dispenser.gradientFlow.getDefaultInstance()); + } + /** + * repeated .Tango.PMR.Jobs.gradientFlow gradient = 3; + */ + public java.util.List + getGradientBuilderList() { + return getGradientFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + com.twine.tango.pmr.jobs.Dispenser.gradientFlow, com.twine.tango.pmr.jobs.Dispenser.gradientFlow.Builder, com.twine.tango.pmr.jobs.Dispenser.gradientFlowOrBuilder> + getGradientFieldBuilder() { + if (gradientBuilder_ == null) { + gradientBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + com.twine.tango.pmr.jobs.Dispenser.gradientFlow, com.twine.tango.pmr.jobs.Dispenser.gradientFlow.Builder, com.twine.tango.pmr.jobs.Dispenser.gradientFlowOrBuilder>( + gradient_, + ((bitField0_ & 0x00000004) == 0x00000004), + getParentForChildren(), + isClean()); + gradient_ = null; + } + return gradientBuilder_; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:Tango.PMR.Jobs.Dispense) + } + + // @@protoc_insertion_point(class_scope:Tango.PMR.Jobs.Dispense) + private static final com.twine.tango.pmr.jobs.Dispenser.Dispense DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.twine.tango.pmr.jobs.Dispenser.Dispense(); + } + + public static com.twine.tango.pmr.jobs.Dispenser.Dispense getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public Dispense parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new Dispense(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.twine.tango.pmr.jobs.Dispenser.Dispense getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_Tango_PMR_Jobs_gradientFlow_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_Tango_PMR_Jobs_gradientFlow_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_Tango_PMR_Jobs_Dispense_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_Tango_PMR_Jobs_Dispense_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n\017dispenser.proto\022\016Tango.PMR.Jobs\"\036\n\014gra" + + "dientFlow\022\016\n\006NLflow\030\001 \001(\001\"Y\n\010Dispense\022\n\n" + + "\002Id\030\001 \001(\005\022\021\n\tstartFlow\030\002 \001(\001\022.\n\010gradient" + + "\030\003 \003(\0132\034.Tango.PMR.Jobs.gradientFlowB\032\n\030" + + "com.twine.tango.pmr.jobsb\006proto3" + }; + com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = + new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { + public com.google.protobuf.ExtensionRegistry assignDescriptors( + com.google.protobuf.Descriptors.FileDescriptor root) { + descriptor = root; + return null; + } + }; + com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + }, assigner); + internal_static_Tango_PMR_Jobs_gradientFlow_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_Tango_PMR_Jobs_gradientFlow_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_Tango_PMR_Jobs_gradientFlow_descriptor, + new java.lang.String[] { "NLflow", }); + internal_static_Tango_PMR_Jobs_Dispense_descriptor = + getDescriptor().getMessageTypes().get(1); + internal_static_Tango_PMR_Jobs_Dispense_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_Tango_PMR_Jobs_Dispense_descriptor, + new java.lang.String[] { "Id", "StartFlow", "Gradient", }); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/jobs/JobOuterClass.java b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/jobs/JobOuterClass.java index 79c17d6a8..08cd603b0 100644 --- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/jobs/JobOuterClass.java +++ b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/jobs/JobOuterClass.java @@ -29,28 +29,104 @@ public final class JobOuterClass { getNameBytes(); /** - * repeated .Tango.PMR.Jobs.Segment Segments = 2; + * 
+     *does user have chosen inter segment enable option
+     *
+ * + * bool interSegEnable = 2; + */ + boolean getInterSegEnable(); + + /** + * 
+     *does user have chosen distanse to spool enable option
+     *
+ * + * bool distanseToSpoolEnable = 3; + */ + boolean getDistanseToSpoolEnable(); + + /** + * 
+     *had distance to spool finished?
+     *
+ * + * uint32 distanceToSpoolLength = 4; + */ + int getDistanceToSpoolLength(); + + /** + * 
+     *repeated temperatureSensorsSetting[Dryer,Head, Mixer]; //temp sensor wanted temperaure in celzius
+     *SCREW:
+     *
+ * + * uint32 startOffsetPulses = 5; + */ + int getStartOffsetPulses(); + + /** + * uint32 spoolBackingRate = 6; + */ + int getSpoolBackingRate(); + + /** + * uint32 segmentOffsetPulses = 7; + */ + int getSegmentOffsetPulses(); + + /** + * uint32 milimetersPerRotation = 8; + */ + int getMilimetersPerRotation(); + + /** + * repeated .Tango.PMR.Jobs.Segment Segments = 9; */ java.util.List getSegmentsList(); /** - * repeated .Tango.PMR.Jobs.Segment Segments = 2; + * repeated .Tango.PMR.Jobs.Segment Segments = 9; */ com.twine.tango.pmr.jobs.SegmentOuterClass.Segment getSegments(int index); /** - * repeated .Tango.PMR.Jobs.Segment Segments = 2; + * repeated .Tango.PMR.Jobs.Segment Segments = 9; */ int getSegmentsCount(); /** - * repeated .Tango.PMR.Jobs.Segment Segments = 2; + * repeated .Tango.PMR.Jobs.Segment Segments = 9; */ java.util.List getSegmentsOrBuilderList(); /** - * repeated .Tango.PMR.Jobs.Segment Segments = 2; + * repeated .Tango.PMR.Jobs.Segment Segments = 9; */ com.twine.tango.pmr.jobs.SegmentOuterClass.SegmentOrBuilder getSegmentsOrBuilder( int index); + + /** + * repeated .Tango.PMR.Jobs.MotorConfig Motors = 10; + */ + java.util.List + getMotorsList(); + /** + * repeated .Tango.PMR.Jobs.MotorConfig Motors = 10; + */ + com.twine.tango.pmr.jobs.Motor.MotorConfig getMotors(int index); + /** + * repeated .Tango.PMR.Jobs.MotorConfig Motors = 10; + */ + int getMotorsCount(); + /** + * repeated .Tango.PMR.Jobs.MotorConfig Motors = 10; + */ + java.util.List + getMotorsOrBuilderList(); + /** + * repeated .Tango.PMR.Jobs.MotorConfig Motors = 10; + */ + com.twine.tango.pmr.jobs.Motor.MotorConfigOrBuilder getMotorsOrBuilder( + int index); } /** * Protobuf type {@code Tango.PMR.Jobs.Job} @@ -66,7 +142,15 @@ public final class JobOuterClass { } private Job() { name_ = ""; + interSegEnable_ = false; + distanseToSpoolEnable_ = false; + distanceToSpoolLength_ = 0; + startOffsetPulses_ = 0; + spoolBackingRate_ = 0; + segmentOffsetPulses_ = 0; + milimetersPerRotation_ = 0; segments_ = java.util.Collections.emptyList(); + motors_ = java.util.Collections.emptyList(); } @java.lang.Override @@ -103,15 +187,59 @@ public final class JobOuterClass { name_ = s; break; } - case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + case 16: { + + interSegEnable_ = input.readBool(); + break; + } + case 24: { + + distanseToSpoolEnable_ = input.readBool(); + break; + } + case 32: { + + distanceToSpoolLength_ = input.readUInt32(); + break; + } + case 40: { + + startOffsetPulses_ = input.readUInt32(); + break; + } + case 48: { + + spoolBackingRate_ = input.readUInt32(); + break; + } + case 56: { + + segmentOffsetPulses_ = input.readUInt32(); + break; + } + case 64: { + + milimetersPerRotation_ = input.readUInt32(); + break; + } + case 74: { + if (!((mutable_bitField0_ & 0x00000100) == 0x00000100)) { segments_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; + mutable_bitField0_ |= 0x00000100; } segments_.add( input.readMessage(com.twine.tango.pmr.jobs.SegmentOuterClass.Segment.parser(), extensionRegistry)); break; } + case 82: { + if (!((mutable_bitField0_ & 0x00000200) == 0x00000200)) { + motors_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000200; + } + motors_.add( + input.readMessage(com.twine.tango.pmr.jobs.Motor.MotorConfig.parser(), extensionRegistry)); + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -120,9 +248,12 @@ public final class JobOuterClass { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000100) == 0x00000100)) { segments_ = java.util.Collections.unmodifiableList(segments_); } + if (((mutable_bitField0_ & 0x00000200) == 0x00000200)) { + motors_ = java.util.Collections.unmodifiableList(motors_); + } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } @@ -174,41 +305,156 @@ public final class JobOuterClass { } } - public static final int SEGMENTS_FIELD_NUMBER = 2; + public static final int INTERSEGENABLE_FIELD_NUMBER = 2; + private boolean interSegEnable_; + /** + * 
+     *does user have chosen inter segment enable option
+     *
+ * + * bool interSegEnable = 2; + */ + public boolean getInterSegEnable() { + return interSegEnable_; + } + + public static final int DISTANSETOSPOOLENABLE_FIELD_NUMBER = 3; + private boolean distanseToSpoolEnable_; + /** + * 
+     *does user have chosen distanse to spool enable option
+     *
+ * + * bool distanseToSpoolEnable = 3; + */ + public boolean getDistanseToSpoolEnable() { + return distanseToSpoolEnable_; + } + + public static final int DISTANCETOSPOOLLENGTH_FIELD_NUMBER = 4; + private int distanceToSpoolLength_; + /** + * 
+     *had distance to spool finished?
+     *
+ * + * uint32 distanceToSpoolLength = 4; + */ + public int getDistanceToSpoolLength() { + return distanceToSpoolLength_; + } + + public static final int STARTOFFSETPULSES_FIELD_NUMBER = 5; + private int startOffsetPulses_; + /** + * 
+     *repeated temperatureSensorsSetting[Dryer,Head, Mixer]; //temp sensor wanted temperaure in celzius
+     *SCREW:
+     *
+ * + * uint32 startOffsetPulses = 5; + */ + public int getStartOffsetPulses() { + return startOffsetPulses_; + } + + public static final int SPOOLBACKINGRATE_FIELD_NUMBER = 6; + private int spoolBackingRate_; + /** + * uint32 spoolBackingRate = 6; + */ + public int getSpoolBackingRate() { + return spoolBackingRate_; + } + + public static final int SEGMENTOFFSETPULSES_FIELD_NUMBER = 7; + private int segmentOffsetPulses_; + /** + * uint32 segmentOffsetPulses = 7; + */ + public int getSegmentOffsetPulses() { + return segmentOffsetPulses_; + } + + public static final int MILIMETERSPERROTATION_FIELD_NUMBER = 8; + private int milimetersPerRotation_; + /** + * uint32 milimetersPerRotation = 8; + */ + public int getMilimetersPerRotation() { + return milimetersPerRotation_; + } + + public static final int SEGMENTS_FIELD_NUMBER = 9; private java.util.List segments_; /** - * repeated .Tango.PMR.Jobs.Segment Segments = 2; + * repeated .Tango.PMR.Jobs.Segment Segments = 9; */ public java.util.List getSegmentsList() { return segments_; } /** - * repeated .Tango.PMR.Jobs.Segment Segments = 2; + * repeated .Tango.PMR.Jobs.Segment Segments = 9; */ public java.util.List getSegmentsOrBuilderList() { return segments_; } /** - * repeated .Tango.PMR.Jobs.Segment Segments = 2; + * repeated .Tango.PMR.Jobs.Segment Segments = 9; */ public int getSegmentsCount() { return segments_.size(); } /** - * repeated .Tango.PMR.Jobs.Segment Segments = 2; + * repeated .Tango.PMR.Jobs.Segment Segments = 9; */ public com.twine.tango.pmr.jobs.SegmentOuterClass.Segment getSegments(int index) { return segments_.get(index); } /** - * repeated .Tango.PMR.Jobs.Segment Segments = 2; + * repeated .Tango.PMR.Jobs.Segment Segments = 9; */ public com.twine.tango.pmr.jobs.SegmentOuterClass.SegmentOrBuilder getSegmentsOrBuilder( int index) { return segments_.get(index); } + public static final int MOTORS_FIELD_NUMBER = 10; + private java.util.List motors_; + /** + * repeated .Tango.PMR.Jobs.MotorConfig Motors = 10; + */ + public java.util.List getMotorsList() { + return motors_; + } + /** + * repeated .Tango.PMR.Jobs.MotorConfig Motors = 10; + */ + public java.util.List + getMotorsOrBuilderList() { + return motors_; + } + /** + * repeated .Tango.PMR.Jobs.MotorConfig Motors = 10; + */ + public int getMotorsCount() { + return motors_.size(); + } + /** + * repeated .Tango.PMR.Jobs.MotorConfig Motors = 10; + */ + public com.twine.tango.pmr.jobs.Motor.MotorConfig getMotors(int index) { + return motors_.get(index); + } + /** + * repeated .Tango.PMR.Jobs.MotorConfig Motors = 10; + */ + public com.twine.tango.pmr.jobs.Motor.MotorConfigOrBuilder getMotorsOrBuilder( + int index) { + return motors_.get(index); + } + private byte memoizedIsInitialized = -1; public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; @@ -224,8 +470,32 @@ public final class JobOuterClass { if (!getNameBytes().isEmpty()) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } + if (interSegEnable_ != false) { + output.writeBool(2, interSegEnable_); + } + if (distanseToSpoolEnable_ != false) { + output.writeBool(3, distanseToSpoolEnable_); + } + if (distanceToSpoolLength_ != 0) { + output.writeUInt32(4, distanceToSpoolLength_); + } + if (startOffsetPulses_ != 0) { + output.writeUInt32(5, startOffsetPulses_); + } + if (spoolBackingRate_ != 0) { + output.writeUInt32(6, spoolBackingRate_); + } + if (segmentOffsetPulses_ != 0) { + output.writeUInt32(7, segmentOffsetPulses_); + } + if (milimetersPerRotation_ != 0) { + output.writeUInt32(8, milimetersPerRotation_); + } for (int i = 0; i < segments_.size(); i++) { - output.writeMessage(2, segments_.get(i)); + output.writeMessage(9, segments_.get(i)); + } + for (int i = 0; i < motors_.size(); i++) { + output.writeMessage(10, motors_.get(i)); } unknownFields.writeTo(output); } @@ -238,9 +508,41 @@ public final class JobOuterClass { if (!getNameBytes().isEmpty()) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } + if (interSegEnable_ != false) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(2, interSegEnable_); + } + if (distanseToSpoolEnable_ != false) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(3, distanseToSpoolEnable_); + } + if (distanceToSpoolLength_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(4, distanceToSpoolLength_); + } + if (startOffsetPulses_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(5, startOffsetPulses_); + } + if (spoolBackingRate_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(6, spoolBackingRate_); + } + if (segmentOffsetPulses_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(7, segmentOffsetPulses_); + } + if (milimetersPerRotation_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(8, milimetersPerRotation_); + } for (int i = 0; i < segments_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, segments_.get(i)); + .computeMessageSize(9, segments_.get(i)); + } + for (int i = 0; i < motors_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(10, motors_.get(i)); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -260,8 +562,24 @@ public final class JobOuterClass { boolean result = true; result = result && getName() .equals(other.getName()); + result = result && (getInterSegEnable() + == other.getInterSegEnable()); + result = result && (getDistanseToSpoolEnable() + == other.getDistanseToSpoolEnable()); + result = result && (getDistanceToSpoolLength() + == other.getDistanceToSpoolLength()); + result = result && (getStartOffsetPulses() + == other.getStartOffsetPulses()); + result = result && (getSpoolBackingRate() + == other.getSpoolBackingRate()); + result = result && (getSegmentOffsetPulses() + == other.getSegmentOffsetPulses()); + result = result && (getMilimetersPerRotation() + == other.getMilimetersPerRotation()); result = result && getSegmentsList() .equals(other.getSegmentsList()); + result = result && getMotorsList() + .equals(other.getMotorsList()); result = result && unknownFields.equals(other.unknownFields); return result; } @@ -275,10 +593,30 @@ public final class JobOuterClass { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + NAME_FIELD_NUMBER; hash = (53 * hash) + getName().hashCode(); + hash = (37 * hash) + INTERSEGENABLE_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getInterSegEnable()); + hash = (37 * hash) + DISTANSETOSPOOLENABLE_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getDistanseToSpoolEnable()); + hash = (37 * hash) + DISTANCETOSPOOLLENGTH_FIELD_NUMBER; + hash = (53 * hash) + getDistanceToSpoolLength(); + hash = (37 * hash) + STARTOFFSETPULSES_FIELD_NUMBER; + hash = (53 * hash) + getStartOffsetPulses(); + hash = (37 * hash) + SPOOLBACKINGRATE_FIELD_NUMBER; + hash = (53 * hash) + getSpoolBackingRate(); + hash = (37 * hash) + SEGMENTOFFSETPULSES_FIELD_NUMBER; + hash = (53 * hash) + getSegmentOffsetPulses(); + hash = (37 * hash) + MILIMETERSPERROTATION_FIELD_NUMBER; + hash = (53 * hash) + getMilimetersPerRotation(); if (getSegmentsCount() > 0) { hash = (37 * hash) + SEGMENTS_FIELD_NUMBER; hash = (53 * hash) + getSegmentsList().hashCode(); } + if (getMotorsCount() > 0) { + hash = (37 * hash) + MOTORS_FIELD_NUMBER; + hash = (53 * hash) + getMotorsList().hashCode(); + } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -405,18 +743,39 @@ public final class JobOuterClass { if (com.google.protobuf.GeneratedMessageV3 .alwaysUseFieldBuilders) { getSegmentsFieldBuilder(); + getMotorsFieldBuilder(); } } public Builder clear() { super.clear(); name_ = ""; + interSegEnable_ = false; + + distanseToSpoolEnable_ = false; + + distanceToSpoolLength_ = 0; + + startOffsetPulses_ = 0; + + spoolBackingRate_ = 0; + + segmentOffsetPulses_ = 0; + + milimetersPerRotation_ = 0; + if (segmentsBuilder_ == null) { segments_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000100); } else { segmentsBuilder_.clear(); } + if (motorsBuilder_ == null) { + motors_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000200); + } else { + motorsBuilder_.clear(); + } return this; } @@ -442,15 +801,31 @@ public final class JobOuterClass { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.name_ = name_; + result.interSegEnable_ = interSegEnable_; + result.distanseToSpoolEnable_ = distanseToSpoolEnable_; + result.distanceToSpoolLength_ = distanceToSpoolLength_; + result.startOffsetPulses_ = startOffsetPulses_; + result.spoolBackingRate_ = spoolBackingRate_; + result.segmentOffsetPulses_ = segmentOffsetPulses_; + result.milimetersPerRotation_ = milimetersPerRotation_; if (segmentsBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000100) == 0x00000100)) { segments_ = java.util.Collections.unmodifiableList(segments_); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000100); } result.segments_ = segments_; } else { result.segments_ = segmentsBuilder_.build(); } + if (motorsBuilder_ == null) { + if (((bitField0_ & 0x00000200) == 0x00000200)) { + motors_ = java.util.Collections.unmodifiableList(motors_); + bitField0_ = (bitField0_ & ~0x00000200); + } + result.motors_ = motors_; + } else { + result.motors_ = motorsBuilder_.build(); + } result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -497,11 +872,32 @@ public final class JobOuterClass { name_ = other.name_; onChanged(); } + if (other.getInterSegEnable() != false) { + setInterSegEnable(other.getInterSegEnable()); + } + if (other.getDistanseToSpoolEnable() != false) { + setDistanseToSpoolEnable(other.getDistanseToSpoolEnable()); + } + if (other.getDistanceToSpoolLength() != 0) { + setDistanceToSpoolLength(other.getDistanceToSpoolLength()); + } + if (other.getStartOffsetPulses() != 0) { + setStartOffsetPulses(other.getStartOffsetPulses()); + } + if (other.getSpoolBackingRate() != 0) { + setSpoolBackingRate(other.getSpoolBackingRate()); + } + if (other.getSegmentOffsetPulses() != 0) { + setSegmentOffsetPulses(other.getSegmentOffsetPulses()); + } + if (other.getMilimetersPerRotation() != 0) { + setMilimetersPerRotation(other.getMilimetersPerRotation()); + } if (segmentsBuilder_ == null) { if (!other.segments_.isEmpty()) { if (segments_.isEmpty()) { segments_ = other.segments_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000100); } else { ensureSegmentsIsMutable(); segments_.addAll(other.segments_); @@ -514,7 +910,7 @@ public final class JobOuterClass { segmentsBuilder_.dispose(); segmentsBuilder_ = null; segments_ = other.segments_; - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000100); segmentsBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getSegmentsFieldBuilder() : null; @@ -523,6 +919,32 @@ public final class JobOuterClass { } } } + if (motorsBuilder_ == null) { + if (!other.motors_.isEmpty()) { + if (motors_.isEmpty()) { + motors_ = other.motors_; + bitField0_ = (bitField0_ & ~0x00000200); + } else { + ensureMotorsIsMutable(); + motors_.addAll(other.motors_); + } + onChanged(); + } + } else { + if (!other.motors_.isEmpty()) { + if (motorsBuilder_.isEmpty()) { + motorsBuilder_.dispose(); + motorsBuilder_ = null; + motors_ = other.motors_; + bitField0_ = (bitField0_ & ~0x00000200); + motorsBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getMotorsFieldBuilder() : null; + } else { + motorsBuilder_.addAllMessages(other.motors_); + } + } + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -620,12 +1042,245 @@ public final class JobOuterClass { return this; } + private boolean interSegEnable_ ; + /** + * 
+       *does user have chosen inter segment enable option
+       *
+ * + * bool interSegEnable = 2; + */ + public boolean getInterSegEnable() { + return interSegEnable_; + } + /** + * 
+       *does user have chosen inter segment enable option
+       *
+ * + * bool interSegEnable = 2; + */ + public Builder setInterSegEnable(boolean value) { + + interSegEnable_ = value; + onChanged(); + return this; + } + /** + * 
+       *does user have chosen inter segment enable option
+       *
+ * + * bool interSegEnable = 2; + */ + public Builder clearInterSegEnable() { + + interSegEnable_ = false; + onChanged(); + return this; + } + + private boolean distanseToSpoolEnable_ ; + /** + * 
+       *does user have chosen distanse to spool enable option
+       *
+ * + * bool distanseToSpoolEnable = 3; + */ + public boolean getDistanseToSpoolEnable() { + return distanseToSpoolEnable_; + } + /** + * 
+       *does user have chosen distanse to spool enable option
+       *
+ * + * bool distanseToSpoolEnable = 3; + */ + public Builder setDistanseToSpoolEnable(boolean value) { + + distanseToSpoolEnable_ = value; + onChanged(); + return this; + } + /** + * 
+       *does user have chosen distanse to spool enable option
+       *
+ * + * bool distanseToSpoolEnable = 3; + */ + public Builder clearDistanseToSpoolEnable() { + + distanseToSpoolEnable_ = false; + onChanged(); + return this; + } + + private int distanceToSpoolLength_ ; + /** + * 
+       *had distance to spool finished?
+       *
+ * + * uint32 distanceToSpoolLength = 4; + */ + public int getDistanceToSpoolLength() { + return distanceToSpoolLength_; + } + /** + * 
+       *had distance to spool finished?
+       *
+ * + * uint32 distanceToSpoolLength = 4; + */ + public Builder setDistanceToSpoolLength(int value) { + + distanceToSpoolLength_ = value; + onChanged(); + return this; + } + /** + * 
+       *had distance to spool finished?
+       *
+ * + * uint32 distanceToSpoolLength = 4; + */ + public Builder clearDistanceToSpoolLength() { + + distanceToSpoolLength_ = 0; + onChanged(); + return this; + } + + private int startOffsetPulses_ ; + /** + * 
+       *repeated temperatureSensorsSetting[Dryer,Head, Mixer]; //temp sensor wanted temperaure in celzius
+       *SCREW:
+       *
+ * + * uint32 startOffsetPulses = 5; + */ + public int getStartOffsetPulses() { + return startOffsetPulses_; + } + /** + * 
+       *repeated temperatureSensorsSetting[Dryer,Head, Mixer]; //temp sensor wanted temperaure in celzius
+       *SCREW:
+       *
+ * + * uint32 startOffsetPulses = 5; + */ + public Builder setStartOffsetPulses(int value) { + + startOffsetPulses_ = value; + onChanged(); + return this; + } + /** + * 
+       *repeated temperatureSensorsSetting[Dryer,Head, Mixer]; //temp sensor wanted temperaure in celzius
+       *SCREW:
+       *
+ * + * uint32 startOffsetPulses = 5; + */ + public Builder clearStartOffsetPulses() { + + startOffsetPulses_ = 0; + onChanged(); + return this; + } + + private int spoolBackingRate_ ; + /** + * uint32 spoolBackingRate = 6; + */ + public int getSpoolBackingRate() { + return spoolBackingRate_; + } + /** + * uint32 spoolBackingRate = 6; + */ + public Builder setSpoolBackingRate(int value) { + + spoolBackingRate_ = value; + onChanged(); + return this; + } + /** + * uint32 spoolBackingRate = 6; + */ + public Builder clearSpoolBackingRate() { + + spoolBackingRate_ = 0; + onChanged(); + return this; + } + + private int segmentOffsetPulses_ ; + /** + * uint32 segmentOffsetPulses = 7; + */ + public int getSegmentOffsetPulses() { + return segmentOffsetPulses_; + } + /** + * uint32 segmentOffsetPulses = 7; + */ + public Builder setSegmentOffsetPulses(int value) { + + segmentOffsetPulses_ = value; + onChanged(); + return this; + } + /** + * uint32 segmentOffsetPulses = 7; + */ + public Builder clearSegmentOffsetPulses() { + + segmentOffsetPulses_ = 0; + onChanged(); + return this; + } + + private int milimetersPerRotation_ ; + /** + * uint32 milimetersPerRotation = 8; + */ + public int getMilimetersPerRotation() { + return milimetersPerRotation_; + } + /** + * uint32 milimetersPerRotation = 8; + */ + public Builder setMilimetersPerRotation(int value) { + + milimetersPerRotation_ = value; + onChanged(); + return this; + } + /** + * uint32 milimetersPerRotation = 8; + */ + public Builder clearMilimetersPerRotation() { + + milimetersPerRotation_ = 0; + onChanged(); + return this; + } + private java.util.List segments_ = java.util.Collections.emptyList(); private void ensureSegmentsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000100) == 0x00000100)) { segments_ = new java.util.ArrayList(segments_); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000100; } } @@ -633,7 +1288,7 @@ public final class JobOuterClass { com.twine.tango.pmr.jobs.SegmentOuterClass.Segment, com.twine.tango.pmr.jobs.SegmentOuterClass.Segment.Builder, com.twine.tango.pmr.jobs.SegmentOuterClass.SegmentOrBuilder> segmentsBuilder_; /** - * repeated .Tango.PMR.Jobs.Segment Segments = 2; + * repeated .Tango.PMR.Jobs.Segment Segments = 9; */ public java.util.List getSegmentsList() { if (segmentsBuilder_ == null) { @@ -643,7 +1298,7 @@ public final class JobOuterClass { } } /** - * repeated .Tango.PMR.Jobs.Segment Segments = 2; + * repeated .Tango.PMR.Jobs.Segment Segments = 9; */ public int getSegmentsCount() { if (segmentsBuilder_ == null) { @@ -653,7 +1308,7 @@ public final class JobOuterClass { } } /** - * repeated .Tango.PMR.Jobs.Segment Segments = 2; + * repeated .Tango.PMR.Jobs.Segment Segments = 9; */ public com.twine.tango.pmr.jobs.SegmentOuterClass.Segment getSegments(int index) { if (segmentsBuilder_ == null) { @@ -663,7 +1318,7 @@ public final class JobOuterClass { } } /** - * repeated .Tango.PMR.Jobs.Segment Segments = 2; + * repeated .Tango.PMR.Jobs.Segment Segments = 9; */ public Builder setSegments( int index, com.twine.tango.pmr.jobs.SegmentOuterClass.Segment value) { @@ -680,7 +1335,7 @@ public final class JobOuterClass { return this; } /** - * repeated .Tango.PMR.Jobs.Segment Segments = 2; + * repeated .Tango.PMR.Jobs.Segment Segments = 9; */ public Builder setSegments( int index, com.twine.tango.pmr.jobs.SegmentOuterClass.Segment.Builder builderForValue) { @@ -694,7 +1349,7 @@ public final class JobOuterClass { return this; } /** - * repeated .Tango.PMR.Jobs.Segment Segments = 2; + * repeated .Tango.PMR.Jobs.Segment Segments = 9; */ public Builder addSegments(com.twine.tango.pmr.jobs.SegmentOuterClass.Segment value) { if (segmentsBuilder_ == null) { @@ -710,7 +1365,7 @@ public final class JobOuterClass { return this; } /** - * repeated .Tango.PMR.Jobs.Segment Segments = 2; + * repeated .Tango.PMR.Jobs.Segment Segments = 9; */ public Builder addSegments( int index, com.twine.tango.pmr.jobs.SegmentOuterClass.Segment value) { @@ -727,7 +1382,7 @@ public final class JobOuterClass { return this; } /** - * repeated .Tango.PMR.Jobs.Segment Segments = 2; + * repeated .Tango.PMR.Jobs.Segment Segments = 9; */ public Builder addSegments( com.twine.tango.pmr.jobs.SegmentOuterClass.Segment.Builder builderForValue) { @@ -741,7 +1396,7 @@ public final class JobOuterClass { return this; } /** - * repeated .Tango.PMR.Jobs.Segment Segments = 2; + * repeated .Tango.PMR.Jobs.Segment Segments = 9; */ public Builder addSegments( int index, com.twine.tango.pmr.jobs.SegmentOuterClass.Segment.Builder builderForValue) { @@ -755,7 +1410,7 @@ public final class JobOuterClass { return this; } /** - * repeated .Tango.PMR.Jobs.Segment Segments = 2; + * repeated .Tango.PMR.Jobs.Segment Segments = 9; */ public Builder addAllSegments( java.lang.Iterable values) { @@ -770,12 +1425,12 @@ public final class JobOuterClass { return this; } /** - * repeated .Tango.PMR.Jobs.Segment Segments = 2; + * repeated .Tango.PMR.Jobs.Segment Segments = 9; */ public Builder clearSegments() { if (segmentsBuilder_ == null) { segments_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000100); onChanged(); } else { segmentsBuilder_.clear(); @@ -783,7 +1438,7 @@ public final class JobOuterClass { return this; } /** - * repeated .Tango.PMR.Jobs.Segment Segments = 2; + * repeated .Tango.PMR.Jobs.Segment Segments = 9; */ public Builder removeSegments(int index) { if (segmentsBuilder_ == null) { @@ -796,14 +1451,14 @@ public final class JobOuterClass { return this; } /** - * repeated .Tango.PMR.Jobs.Segment Segments = 2; + * repeated .Tango.PMR.Jobs.Segment Segments = 9; */ public com.twine.tango.pmr.jobs.SegmentOuterClass.Segment.Builder getSegmentsBuilder( int index) { return getSegmentsFieldBuilder().getBuilder(index); } /** - * repeated .Tango.PMR.Jobs.Segment Segments = 2; + * repeated .Tango.PMR.Jobs.Segment Segments = 9; */ public com.twine.tango.pmr.jobs.SegmentOuterClass.SegmentOrBuilder getSegmentsOrBuilder( int index) { @@ -813,7 +1468,7 @@ public final class JobOuterClass { } } /** - * repeated .Tango.PMR.Jobs.Segment Segments = 2; + * repeated .Tango.PMR.Jobs.Segment Segments = 9; */ public java.util.List getSegmentsOrBuilderList() { @@ -824,14 +1479,14 @@ public final class JobOuterClass { } } /** - * repeated .Tango.PMR.Jobs.Segment Segments = 2; + * repeated .Tango.PMR.Jobs.Segment Segments = 9; */ public com.twine.tango.pmr.jobs.SegmentOuterClass.Segment.Builder addSegmentsBuilder() { return getSegmentsFieldBuilder().addBuilder( com.twine.tango.pmr.jobs.SegmentOuterClass.Segment.getDefaultInstance()); } /** - * repeated .Tango.PMR.Jobs.Segment Segments = 2; + * repeated .Tango.PMR.Jobs.Segment Segments = 9; */ public com.twine.tango.pmr.jobs.SegmentOuterClass.Segment.Builder addSegmentsBuilder( int index) { @@ -839,7 +1494,7 @@ public final class JobOuterClass { index, com.twine.tango.pmr.jobs.SegmentOuterClass.Segment.getDefaultInstance()); } /** - * repeated .Tango.PMR.Jobs.Segment Segments = 2; + * repeated .Tango.PMR.Jobs.Segment Segments = 9; */ public java.util.List getSegmentsBuilderList() { @@ -852,13 +1507,253 @@ public final class JobOuterClass { segmentsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< com.twine.tango.pmr.jobs.SegmentOuterClass.Segment, com.twine.tango.pmr.jobs.SegmentOuterClass.Segment.Builder, com.twine.tango.pmr.jobs.SegmentOuterClass.SegmentOrBuilder>( segments_, - ((bitField0_ & 0x00000002) == 0x00000002), + ((bitField0_ & 0x00000100) == 0x00000100), getParentForChildren(), isClean()); segments_ = null; } return segmentsBuilder_; } + + private java.util.List motors_ = + java.util.Collections.emptyList(); + private void ensureMotorsIsMutable() { + if (!((bitField0_ & 0x00000200) == 0x00000200)) { + motors_ = new java.util.ArrayList(motors_); + bitField0_ |= 0x00000200; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + com.twine.tango.pmr.jobs.Motor.MotorConfig, com.twine.tango.pmr.jobs.Motor.MotorConfig.Builder, com.twine.tango.pmr.jobs.Motor.MotorConfigOrBuilder> motorsBuilder_; + + /** + * repeated .Tango.PMR.Jobs.MotorConfig Motors = 10; + */ + public java.util.List getMotorsList() { + if (motorsBuilder_ == null) { + return java.util.Collections.unmodifiableList(motors_); + } else { + return motorsBuilder_.getMessageList(); + } + } + /** + * repeated .Tango.PMR.Jobs.MotorConfig Motors = 10; + */ + public int getMotorsCount() { + if (motorsBuilder_ == null) { + return motors_.size(); + } else { + return motorsBuilder_.getCount(); + } + } + /** + * repeated .Tango.PMR.Jobs.MotorConfig Motors = 10; + */ + public com.twine.tango.pmr.jobs.Motor.MotorConfig getMotors(int index) { + if (motorsBuilder_ == null) { + return motors_.get(index); + } else { + return motorsBuilder_.getMessage(index); + } + } + /** + * repeated .Tango.PMR.Jobs.MotorConfig Motors = 10; + */ + public Builder setMotors( + int index, com.twine.tango.pmr.jobs.Motor.MotorConfig value) { + if (motorsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureMotorsIsMutable(); + motors_.set(index, value); + onChanged(); + } else { + motorsBuilder_.setMessage(index, value); + } + return this; + } + /** + * repeated .Tango.PMR.Jobs.MotorConfig Motors = 10; + */ + public Builder setMotors( + int index, com.twine.tango.pmr.jobs.Motor.MotorConfig.Builder builderForValue) { + if (motorsBuilder_ == null) { + ensureMotorsIsMutable(); + motors_.set(index, builderForValue.build()); + onChanged(); + } else { + motorsBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .Tango.PMR.Jobs.MotorConfig Motors = 10; + */ + public Builder addMotors(com.twine.tango.pmr.jobs.Motor.MotorConfig value) { + if (motorsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureMotorsIsMutable(); + motors_.add(value); + onChanged(); + } else { + motorsBuilder_.addMessage(value); + } + return this; + } + /** + * repeated .Tango.PMR.Jobs.MotorConfig Motors = 10; + */ + public Builder addMotors( + int index, com.twine.tango.pmr.jobs.Motor.MotorConfig value) { + if (motorsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureMotorsIsMutable(); + motors_.add(index, value); + onChanged(); + } else { + motorsBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .Tango.PMR.Jobs.MotorConfig Motors = 10; + */ + public Builder addMotors( + com.twine.tango.pmr.jobs.Motor.MotorConfig.Builder builderForValue) { + if (motorsBuilder_ == null) { + ensureMotorsIsMutable(); + motors_.add(builderForValue.build()); + onChanged(); + } else { + motorsBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .Tango.PMR.Jobs.MotorConfig Motors = 10; + */ + public Builder addMotors( + int index, com.twine.tango.pmr.jobs.Motor.MotorConfig.Builder builderForValue) { + if (motorsBuilder_ == null) { + ensureMotorsIsMutable(); + motors_.add(index, builderForValue.build()); + onChanged(); + } else { + motorsBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .Tango.PMR.Jobs.MotorConfig Motors = 10; + */ + public Builder addAllMotors( + java.lang.Iterable values) { + if (motorsBuilder_ == null) { + ensureMotorsIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, motors_); + onChanged(); + } else { + motorsBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .Tango.PMR.Jobs.MotorConfig Motors = 10; + */ + public Builder clearMotors() { + if (motorsBuilder_ == null) { + motors_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000200); + onChanged(); + } else { + motorsBuilder_.clear(); + } + return this; + } + /** + * repeated .Tango.PMR.Jobs.MotorConfig Motors = 10; + */ + public Builder removeMotors(int index) { + if (motorsBuilder_ == null) { + ensureMotorsIsMutable(); + motors_.remove(index); + onChanged(); + } else { + motorsBuilder_.remove(index); + } + return this; + } + /** + * repeated .Tango.PMR.Jobs.MotorConfig Motors = 10; + */ + public com.twine.tango.pmr.jobs.Motor.MotorConfig.Builder getMotorsBuilder( + int index) { + return getMotorsFieldBuilder().getBuilder(index); + } + /** + * repeated .Tango.PMR.Jobs.MotorConfig Motors = 10; + */ + public com.twine.tango.pmr.jobs.Motor.MotorConfigOrBuilder getMotorsOrBuilder( + int index) { + if (motorsBuilder_ == null) { + return motors_.get(index); } else { + return motorsBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .Tango.PMR.Jobs.MotorConfig Motors = 10; + */ + public java.util.List + getMotorsOrBuilderList() { + if (motorsBuilder_ != null) { + return motorsBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(motors_); + } + } + /** + * repeated .Tango.PMR.Jobs.MotorConfig Motors = 10; + */ + public com.twine.tango.pmr.jobs.Motor.MotorConfig.Builder addMotorsBuilder() { + return getMotorsFieldBuilder().addBuilder( + com.twine.tango.pmr.jobs.Motor.MotorConfig.getDefaultInstance()); + } + /** + * repeated .Tango.PMR.Jobs.MotorConfig Motors = 10; + */ + public com.twine.tango.pmr.jobs.Motor.MotorConfig.Builder addMotorsBuilder( + int index) { + return getMotorsFieldBuilder().addBuilder( + index, com.twine.tango.pmr.jobs.Motor.MotorConfig.getDefaultInstance()); + } + /** + * repeated .Tango.PMR.Jobs.MotorConfig Motors = 10; + */ + public java.util.List + getMotorsBuilderList() { + return getMotorsFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + com.twine.tango.pmr.jobs.Motor.MotorConfig, com.twine.tango.pmr.jobs.Motor.MotorConfig.Builder, com.twine.tango.pmr.jobs.Motor.MotorConfigOrBuilder> + getMotorsFieldBuilder() { + if (motorsBuilder_ == null) { + motorsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + com.twine.tango.pmr.jobs.Motor.MotorConfig, com.twine.tango.pmr.jobs.Motor.MotorConfig.Builder, com.twine.tango.pmr.jobs.Motor.MotorConfigOrBuilder>( + motors_, + ((bitField0_ & 0x00000200) == 0x00000200), + getParentForChildren(), + isClean()); + motors_ = null; + } + return motorsBuilder_; + } public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); @@ -923,9 +1818,15 @@ public final class JobOuterClass { static { java.lang.String[] descriptorData = { "\n\tJob.proto\022\016Tango.PMR.Jobs\032\rSegment.pro" + - "to\">\n\003Job\022\014\n\004Name\030\001 \001(\t\022)\n\010Segments\030\002 \003(" + - "\0132\027.Tango.PMR.Jobs.SegmentB\032\n\030com.twine." + - "tango.pmr.jobsb\006proto3" + "to\032\013motor.proto\"\262\002\n\003Job\022\014\n\004Name\030\001 \001(\t\022\026\n" + + "\016interSegEnable\030\002 \001(\010\022\035\n\025distanseToSpool" + + "Enable\030\003 \001(\010\022\035\n\025distanceToSpoolLength\030\004 " + + "\001(\r\022\031\n\021startOffsetPulses\030\005 \001(\r\022\030\n\020spoolB" + + "ackingRate\030\006 \001(\r\022\033\n\023segmentOffsetPulses\030" + + "\007 \001(\r\022\035\n\025milimetersPerRotation\030\010 \001(\r\022)\n\010" + + "Segments\030\t \003(\0132\027.Tango.PMR.Jobs.Segment\022" + + "+\n\006Motors\030\n \003(\0132\033.Tango.PMR.Jobs.MotorCo" + + "nfigB\032\n\030com.twine.tango.pmr.jobsb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -939,14 +1840,16 @@ public final class JobOuterClass { .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { com.twine.tango.pmr.jobs.SegmentOuterClass.getDescriptor(), + com.twine.tango.pmr.jobs.Motor.getDescriptor(), }, assigner); internal_static_Tango_PMR_Jobs_Job_descriptor = getDescriptor().getMessageTypes().get(0); internal_static_Tango_PMR_Jobs_Job_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_Tango_PMR_Jobs_Job_descriptor, - new java.lang.String[] { "Name", "Segments", }); + new java.lang.String[] { "Name", "InterSegEnable", "DistanseToSpoolEnable", "DistanceToSpoolLength", "StartOffsetPulses", "SpoolBackingRate", "SegmentOffsetPulses", "MilimetersPerRotation", "Segments", "Motors", }); com.twine.tango.pmr.jobs.SegmentOuterClass.getDescriptor(); + com.twine.tango.pmr.jobs.Motor.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/jobs/Motor.java b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/jobs/Motor.java new file mode 100644 index 000000000..9b099e7d4 --- /dev/null +++ b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/jobs/Motor.java @@ -0,0 +1,1500 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: motor.proto + +package com.twine.tango.pmr.jobs; + +public final class Motor { + private Motor() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); + } + /** + * Protobuf enum {@code Tango.PMR.Jobs.MotorId} + */ + public enum MotorId + implements com.google.protobuf.ProtocolMessageEnum { + /** + * Feeder = 0; + */ + Feeder(0), + /** + * Dryer = 1; + */ + Dryer(1), + /** + * Pooler = 2; + */ + Pooler(2), + /** + * Winder = 3; + */ + Winder(3), + UNRECOGNIZED(-1), + ; + + /** + * Feeder = 0; + */ + public static final int Feeder_VALUE = 0; + /** + * Dryer = 1; + */ + public static final int Dryer_VALUE = 1; + /** + * Pooler = 2; + */ + public static final int Pooler_VALUE = 2; + /** + * Winder = 3; + */ + public static final int Winder_VALUE = 3; + + + public final int getNumber() { + if (this == UNRECOGNIZED) { + throw new java.lang.IllegalArgumentException( + "Can't get the number of an unknown enum value."); + } + return value; + } + + /** + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static MotorId valueOf(int value) { + return forNumber(value); + } + + public static MotorId forNumber(int value) { + switch (value) { + case 0: return Feeder; + case 1: return Dryer; + case 2: return Pooler; + case 3: return Winder; + default: return null; + } + } + + public static com.google.protobuf.Internal.EnumLiteMap + internalGetValueMap() { + return internalValueMap; + } + private static final com.google.protobuf.Internal.EnumLiteMap< + MotorId> internalValueMap = + new com.google.protobuf.Internal.EnumLiteMap() { + public MotorId findValueByNumber(int number) { + return MotorId.forNumber(number); + } + }; + + public final com.google.protobuf.Descriptors.EnumValueDescriptor + getValueDescriptor() { + return getDescriptor().getValues().get(ordinal()); + } + public final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptorForType() { + return getDescriptor(); + } + public static final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptor() { + return com.twine.tango.pmr.jobs.Motor.getDescriptor().getEnumTypes().get(0); + } + + private static final MotorId[] VALUES = values(); + + public static MotorId valueOf( + com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + if (desc.getType() != getDescriptor()) { + throw new java.lang.IllegalArgumentException( + "EnumValueDescriptor is not for this type."); + } + if (desc.getIndex() == -1) { + return UNRECOGNIZED; + } + return VALUES[desc.getIndex()]; + } + + private final int value; + + private MotorId(int value) { + this.value = value; + } + + // @@protoc_insertion_point(enum_scope:Tango.PMR.Jobs.MotorId) + } + + public interface MotorConfigOrBuilder extends + // @@protoc_insertion_point(interface_extends:Tango.PMR.Jobs.MotorConfig) + com.google.protobuf.MessageOrBuilder { + + /** + * .Tango.PMR.Jobs.MotorId Id = 1; + */ + int getIdValue(); + /** + * .Tango.PMR.Jobs.MotorId Id = 1; + */ + com.twine.tango.pmr.jobs.Motor.MotorId getId(); + + /** + * uint32 minfreq = 2; + */ + int getMinfreq(); + + /** + * uint32 maxfreq = 3; + */ + int getMaxfreq(); + + /** + * uint32 minmicrostep = 4; + */ + int getMinmicrostep(); + + /** + * uint32 maxmicrostep = 5; + */ + int getMaxmicrostep(); + + /** + * double linearratio = 6; + */ + double getLinearratio(); + + /** + * uint32 medianposition = 7; + */ + int getMedianposition(); + + /** + * double correctiongain = 8; + */ + double getCorrectiongain(); + + /** + * double ration2dryerspd = 9; + */ + double getRation2Dryerspd(); + + /** + * double Kp = 10; + */ + double getKp(); + + /** + * double Ki = 11; + */ + double getKi(); + + /** + * double Kd = 12; + */ + double getKd(); + + /** + * double changeSlope = 13; + */ + double getChangeSlope(); + + /** + * double hightimeoutmSec = 14; + */ + double getHightimeoutmSec(); + } + /** + * Protobuf type {@code Tango.PMR.Jobs.MotorConfig} + */ + public static final class MotorConfig extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:Tango.PMR.Jobs.MotorConfig) + MotorConfigOrBuilder { + private static final long serialVersionUID = 0L; + // Use MotorConfig.newBuilder() to construct. + private MotorConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private MotorConfig() { + id_ = 0; + minfreq_ = 0; + maxfreq_ = 0; + minmicrostep_ = 0; + maxmicrostep_ = 0; + linearratio_ = 0D; + medianposition_ = 0; + correctiongain_ = 0D; + ration2Dryerspd_ = 0D; + kp_ = 0D; + ki_ = 0D; + kd_ = 0D; + changeSlope_ = 0D; + hightimeoutmSec_ = 0D; + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private MotorConfig( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 8: { + int rawValue = input.readEnum(); + + id_ = rawValue; + break; + } + case 16: { + + minfreq_ = input.readUInt32(); + break; + } + case 24: { + + maxfreq_ = input.readUInt32(); + break; + } + case 32: { + + minmicrostep_ = input.readUInt32(); + break; + } + case 40: { + + maxmicrostep_ = input.readUInt32(); + break; + } + case 49: { + + linearratio_ = input.readDouble(); + break; + } + case 56: { + + medianposition_ = input.readUInt32(); + break; + } + case 65: { + + correctiongain_ = input.readDouble(); + break; + } + case 73: { + + ration2Dryerspd_ = input.readDouble(); + break; + } + case 81: { + + kp_ = input.readDouble(); + break; + } + case 89: { + + ki_ = input.readDouble(); + break; + } + case 97: { + + kd_ = input.readDouble(); + break; + } + case 105: { + + changeSlope_ = input.readDouble(); + break; + } + case 113: { + + hightimeoutmSec_ = input.readDouble(); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.twine.tango.pmr.jobs.Motor.internal_static_Tango_PMR_Jobs_MotorConfig_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.twine.tango.pmr.jobs.Motor.internal_static_Tango_PMR_Jobs_MotorConfig_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.twine.tango.pmr.jobs.Motor.MotorConfig.class, com.twine.tango.pmr.jobs.Motor.MotorConfig.Builder.class); + } + + public static final int ID_FIELD_NUMBER = 1; + private int id_; + /** + * .Tango.PMR.Jobs.MotorId Id = 1; + */ + public int getIdValue() { + return id_; + } + /** + * .Tango.PMR.Jobs.MotorId Id = 1; + */ + public com.twine.tango.pmr.jobs.Motor.MotorId getId() { + com.twine.tango.pmr.jobs.Motor.MotorId result = com.twine.tango.pmr.jobs.Motor.MotorId.valueOf(id_); + return result == null ? com.twine.tango.pmr.jobs.Motor.MotorId.UNRECOGNIZED : result; + } + + public static final int MINFREQ_FIELD_NUMBER = 2; + private int minfreq_; + /** + * uint32 minfreq = 2; + */ + public int getMinfreq() { + return minfreq_; + } + + public static final int MAXFREQ_FIELD_NUMBER = 3; + private int maxfreq_; + /** + * uint32 maxfreq = 3; + */ + public int getMaxfreq() { + return maxfreq_; + } + + public static final int MINMICROSTEP_FIELD_NUMBER = 4; + private int minmicrostep_; + /** + * uint32 minmicrostep = 4; + */ + public int getMinmicrostep() { + return minmicrostep_; + } + + public static final int MAXMICROSTEP_FIELD_NUMBER = 5; + private int maxmicrostep_; + /** + * uint32 maxmicrostep = 5; + */ + public int getMaxmicrostep() { + return maxmicrostep_; + } + + public static final int LINEARRATIO_FIELD_NUMBER = 6; + private double linearratio_; + /** + * double linearratio = 6; + */ + public double getLinearratio() { + return linearratio_; + } + + public static final int MEDIANPOSITION_FIELD_NUMBER = 7; + private int medianposition_; + /** + * uint32 medianposition = 7; + */ + public int getMedianposition() { + return medianposition_; + } + + public static final int CORRECTIONGAIN_FIELD_NUMBER = 8; + private double correctiongain_; + /** + * double correctiongain = 8; + */ + public double getCorrectiongain() { + return correctiongain_; + } + + public static final int RATION2DRYERSPD_FIELD_NUMBER = 9; + private double ration2Dryerspd_; + /** + * double ration2dryerspd = 9; + */ + public double getRation2Dryerspd() { + return ration2Dryerspd_; + } + + public static final int KP_FIELD_NUMBER = 10; + private double kp_; + /** + * double Kp = 10; + */ + public double getKp() { + return kp_; + } + + public static final int KI_FIELD_NUMBER = 11; + private double ki_; + /** + * double Ki = 11; + */ + public double getKi() { + return ki_; + } + + public static final int KD_FIELD_NUMBER = 12; + private double kd_; + /** + * double Kd = 12; + */ + public double getKd() { + return kd_; + } + + public static final int CHANGESLOPE_FIELD_NUMBER = 13; + private double changeSlope_; + /** + * double changeSlope = 13; + */ + public double getChangeSlope() { + return changeSlope_; + } + + public static final int HIGHTIMEOUTMSEC_FIELD_NUMBER = 14; + private double hightimeoutmSec_; + /** + * double hightimeoutmSec = 14; + */ + public double getHightimeoutmSec() { + return hightimeoutmSec_; + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (id_ != com.twine.tango.pmr.jobs.Motor.MotorId.Feeder.getNumber()) { + output.writeEnum(1, id_); + } + if (minfreq_ != 0) { + output.writeUInt32(2, minfreq_); + } + if (maxfreq_ != 0) { + output.writeUInt32(3, maxfreq_); + } + if (minmicrostep_ != 0) { + output.writeUInt32(4, minmicrostep_); + } + if (maxmicrostep_ != 0) { + output.writeUInt32(5, maxmicrostep_); + } + if (linearratio_ != 0D) { + output.writeDouble(6, linearratio_); + } + if (medianposition_ != 0) { + output.writeUInt32(7, medianposition_); + } + if (correctiongain_ != 0D) { + output.writeDouble(8, correctiongain_); + } + if (ration2Dryerspd_ != 0D) { + output.writeDouble(9, ration2Dryerspd_); + } + if (kp_ != 0D) { + output.writeDouble(10, kp_); + } + if (ki_ != 0D) { + output.writeDouble(11, ki_); + } + if (kd_ != 0D) { + output.writeDouble(12, kd_); + } + if (changeSlope_ != 0D) { + output.writeDouble(13, changeSlope_); + } + if (hightimeoutmSec_ != 0D) { + output.writeDouble(14, hightimeoutmSec_); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (id_ != com.twine.tango.pmr.jobs.Motor.MotorId.Feeder.getNumber()) { + size += com.google.protobuf.CodedOutputStream + .computeEnumSize(1, id_); + } + if (minfreq_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(2, minfreq_); + } + if (maxfreq_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(3, maxfreq_); + } + if (minmicrostep_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(4, minmicrostep_); + } + if (maxmicrostep_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(5, maxmicrostep_); + } + if (linearratio_ != 0D) { + size += com.google.protobuf.CodedOutputStream + .computeDoubleSize(6, linearratio_); + } + if (medianposition_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(7, medianposition_); + } + if (correctiongain_ != 0D) { + size += com.google.protobuf.CodedOutputStream + .computeDoubleSize(8, correctiongain_); + } + if (ration2Dryerspd_ != 0D) { + size += com.google.protobuf.CodedOutputStream + .computeDoubleSize(9, ration2Dryerspd_); + } + if (kp_ != 0D) { + size += com.google.protobuf.CodedOutputStream + .computeDoubleSize(10, kp_); + } + if (ki_ != 0D) { + size += com.google.protobuf.CodedOutputStream + .computeDoubleSize(11, ki_); + } + if (kd_ != 0D) { + size += com.google.protobuf.CodedOutputStream + .computeDoubleSize(12, kd_); + } + if (changeSlope_ != 0D) { + size += com.google.protobuf.CodedOutputStream + .computeDoubleSize(13, changeSlope_); + } + if (hightimeoutmSec_ != 0D) { + size += com.google.protobuf.CodedOutputStream + .computeDoubleSize(14, hightimeoutmSec_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.twine.tango.pmr.jobs.Motor.MotorConfig)) { + return super.equals(obj); + } + com.twine.tango.pmr.jobs.Motor.MotorConfig other = (com.twine.tango.pmr.jobs.Motor.MotorConfig) obj; + + boolean result = true; + result = result && id_ == other.id_; + result = result && (getMinfreq() + == other.getMinfreq()); + result = result && (getMaxfreq() + == other.getMaxfreq()); + result = result && (getMinmicrostep() + == other.getMinmicrostep()); + result = result && (getMaxmicrostep() + == other.getMaxmicrostep()); + result = result && ( + java.lang.Double.doubleToLongBits(getLinearratio()) + == java.lang.Double.doubleToLongBits( + other.getLinearratio())); + result = result && (getMedianposition() + == other.getMedianposition()); + result = result && ( + java.lang.Double.doubleToLongBits(getCorrectiongain()) + == java.lang.Double.doubleToLongBits( + other.getCorrectiongain())); + result = result && ( + java.lang.Double.doubleToLongBits(getRation2Dryerspd()) + == java.lang.Double.doubleToLongBits( + other.getRation2Dryerspd())); + result = result && ( + java.lang.Double.doubleToLongBits(getKp()) + == java.lang.Double.doubleToLongBits( + other.getKp())); + result = result && ( + java.lang.Double.doubleToLongBits(getKi()) + == java.lang.Double.doubleToLongBits( + other.getKi())); + result = result && ( + java.lang.Double.doubleToLongBits(getKd()) + == java.lang.Double.doubleToLongBits( + other.getKd())); + result = result && ( + java.lang.Double.doubleToLongBits(getChangeSlope()) + == java.lang.Double.doubleToLongBits( + other.getChangeSlope())); + result = result && ( + java.lang.Double.doubleToLongBits(getHightimeoutmSec()) + == java.lang.Double.doubleToLongBits( + other.getHightimeoutmSec())); + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + ID_FIELD_NUMBER; + hash = (53 * hash) + id_; + hash = (37 * hash) + MINFREQ_FIELD_NUMBER; + hash = (53 * hash) + getMinfreq(); + hash = (37 * hash) + MAXFREQ_FIELD_NUMBER; + hash = (53 * hash) + getMaxfreq(); + hash = (37 * hash) + MINMICROSTEP_FIELD_NUMBER; + hash = (53 * hash) + getMinmicrostep(); + hash = (37 * hash) + MAXMICROSTEP_FIELD_NUMBER; + hash = (53 * hash) + getMaxmicrostep(); + hash = (37 * hash) + LINEARRATIO_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + java.lang.Double.doubleToLongBits(getLinearratio())); + hash = (37 * hash) + MEDIANPOSITION_FIELD_NUMBER; + hash = (53 * hash) + getMedianposition(); + hash = (37 * hash) + CORRECTIONGAIN_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + java.lang.Double.doubleToLongBits(getCorrectiongain())); + hash = (37 * hash) + RATION2DRYERSPD_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + java.lang.Double.doubleToLongBits(getRation2Dryerspd())); + hash = (37 * hash) + KP_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + java.lang.Double.doubleToLongBits(getKp())); + hash = (37 * hash) + KI_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + java.lang.Double.doubleToLongBits(getKi())); + hash = (37 * hash) + KD_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + java.lang.Double.doubleToLongBits(getKd())); + hash = (37 * hash) + CHANGESLOPE_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + java.lang.Double.doubleToLongBits(getChangeSlope())); + hash = (37 * hash) + HIGHTIMEOUTMSEC_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + java.lang.Double.doubleToLongBits(getHightimeoutmSec())); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.twine.tango.pmr.jobs.Motor.MotorConfig parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.twine.tango.pmr.jobs.Motor.MotorConfig parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.twine.tango.pmr.jobs.Motor.MotorConfig parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.twine.tango.pmr.jobs.Motor.MotorConfig parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.twine.tango.pmr.jobs.Motor.MotorConfig parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.twine.tango.pmr.jobs.Motor.MotorConfig parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.twine.tango.pmr.jobs.Motor.MotorConfig parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.twine.tango.pmr.jobs.Motor.MotorConfig parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.twine.tango.pmr.jobs.Motor.MotorConfig parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.twine.tango.pmr.jobs.Motor.MotorConfig parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.twine.tango.pmr.jobs.Motor.MotorConfig parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.twine.tango.pmr.jobs.Motor.MotorConfig parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.twine.tango.pmr.jobs.Motor.MotorConfig prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code Tango.PMR.Jobs.MotorConfig} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:Tango.PMR.Jobs.MotorConfig) + com.twine.tango.pmr.jobs.Motor.MotorConfigOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.twine.tango.pmr.jobs.Motor.internal_static_Tango_PMR_Jobs_MotorConfig_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.twine.tango.pmr.jobs.Motor.internal_static_Tango_PMR_Jobs_MotorConfig_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.twine.tango.pmr.jobs.Motor.MotorConfig.class, com.twine.tango.pmr.jobs.Motor.MotorConfig.Builder.class); + } + + // Construct using com.twine.tango.pmr.jobs.Motor.MotorConfig.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + public Builder clear() { + super.clear(); + id_ = 0; + + minfreq_ = 0; + + maxfreq_ = 0; + + minmicrostep_ = 0; + + maxmicrostep_ = 0; + + linearratio_ = 0D; + + medianposition_ = 0; + + correctiongain_ = 0D; + + ration2Dryerspd_ = 0D; + + kp_ = 0D; + + ki_ = 0D; + + kd_ = 0D; + + changeSlope_ = 0D; + + hightimeoutmSec_ = 0D; + + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.twine.tango.pmr.jobs.Motor.internal_static_Tango_PMR_Jobs_MotorConfig_descriptor; + } + + public com.twine.tango.pmr.jobs.Motor.MotorConfig getDefaultInstanceForType() { + return com.twine.tango.pmr.jobs.Motor.MotorConfig.getDefaultInstance(); + } + + public com.twine.tango.pmr.jobs.Motor.MotorConfig build() { + com.twine.tango.pmr.jobs.Motor.MotorConfig result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.twine.tango.pmr.jobs.Motor.MotorConfig buildPartial() { + com.twine.tango.pmr.jobs.Motor.MotorConfig result = new com.twine.tango.pmr.jobs.Motor.MotorConfig(this); + result.id_ = id_; + result.minfreq_ = minfreq_; + result.maxfreq_ = maxfreq_; + result.minmicrostep_ = minmicrostep_; + result.maxmicrostep_ = maxmicrostep_; + result.linearratio_ = linearratio_; + result.medianposition_ = medianposition_; + result.correctiongain_ = correctiongain_; + result.ration2Dryerspd_ = ration2Dryerspd_; + result.kp_ = kp_; + result.ki_ = ki_; + result.kd_ = kd_; + result.changeSlope_ = changeSlope_; + result.hightimeoutmSec_ = hightimeoutmSec_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.twine.tango.pmr.jobs.Motor.MotorConfig) { + return mergeFrom((com.twine.tango.pmr.jobs.Motor.MotorConfig)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.twine.tango.pmr.jobs.Motor.MotorConfig other) { + if (other == com.twine.tango.pmr.jobs.Motor.MotorConfig.getDefaultInstance()) return this; + if (other.id_ != 0) { + setIdValue(other.getIdValue()); + } + if (other.getMinfreq() != 0) { + setMinfreq(other.getMinfreq()); + } + if (other.getMaxfreq() != 0) { + setMaxfreq(other.getMaxfreq()); + } + if (other.getMinmicrostep() != 0) { + setMinmicrostep(other.getMinmicrostep()); + } + if (other.getMaxmicrostep() != 0) { + setMaxmicrostep(other.getMaxmicrostep()); + } + if (other.getLinearratio() != 0D) { + setLinearratio(other.getLinearratio()); + } + if (other.getMedianposition() != 0) { + setMedianposition(other.getMedianposition()); + } + if (other.getCorrectiongain() != 0D) { + setCorrectiongain(other.getCorrectiongain()); + } + if (other.getRation2Dryerspd() != 0D) { + setRation2Dryerspd(other.getRation2Dryerspd()); + } + if (other.getKp() != 0D) { + setKp(other.getKp()); + } + if (other.getKi() != 0D) { + setKi(other.getKi()); + } + if (other.getKd() != 0D) { + setKd(other.getKd()); + } + if (other.getChangeSlope() != 0D) { + setChangeSlope(other.getChangeSlope()); + } + if (other.getHightimeoutmSec() != 0D) { + setHightimeoutmSec(other.getHightimeoutmSec()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.twine.tango.pmr.jobs.Motor.MotorConfig parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.twine.tango.pmr.jobs.Motor.MotorConfig) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private int id_ = 0; + /** + * .Tango.PMR.Jobs.MotorId Id = 1; + */ + public int getIdValue() { + return id_; + } + /** + * .Tango.PMR.Jobs.MotorId Id = 1; + */ + public Builder setIdValue(int value) { + id_ = value; + onChanged(); + return this; + } + /** + * .Tango.PMR.Jobs.MotorId Id = 1; + */ + public com.twine.tango.pmr.jobs.Motor.MotorId getId() { + com.twine.tango.pmr.jobs.Motor.MotorId result = com.twine.tango.pmr.jobs.Motor.MotorId.valueOf(id_); + return result == null ? com.twine.tango.pmr.jobs.Motor.MotorId.UNRECOGNIZED : result; + } + /** + * .Tango.PMR.Jobs.MotorId Id = 1; + */ + public Builder setId(com.twine.tango.pmr.jobs.Motor.MotorId value) { + if (value == null) { + throw new NullPointerException(); + } + + id_ = value.getNumber(); + onChanged(); + return this; + } + /** + * .Tango.PMR.Jobs.MotorId Id = 1; + */ + public Builder clearId() { + + id_ = 0; + onChanged(); + return this; + } + + private int minfreq_ ; + /** + * uint32 minfreq = 2; + */ + public int getMinfreq() { + return minfreq_; + } + /** + * uint32 minfreq = 2; + */ + public Builder setMinfreq(int value) { + + minfreq_ = value; + onChanged(); + return this; + } + /** + * uint32 minfreq = 2; + */ + public Builder clearMinfreq() { + + minfreq_ = 0; + onChanged(); + return this; + } + + private int maxfreq_ ; + /** + * uint32 maxfreq = 3; + */ + public int getMaxfreq() { + return maxfreq_; + } + /** + * uint32 maxfreq = 3; + */ + public Builder setMaxfreq(int value) { + + maxfreq_ = value; + onChanged(); + return this; + } + /** + * uint32 maxfreq = 3; + */ + public Builder clearMaxfreq() { + + maxfreq_ = 0; + onChanged(); + return this; + } + + private int minmicrostep_ ; + /** + * uint32 minmicrostep = 4; + */ + public int getMinmicrostep() { + return minmicrostep_; + } + /** + * uint32 minmicrostep = 4; + */ + public Builder setMinmicrostep(int value) { + + minmicrostep_ = value; + onChanged(); + return this; + } + /** + * uint32 minmicrostep = 4; + */ + public Builder clearMinmicrostep() { + + minmicrostep_ = 0; + onChanged(); + return this; + } + + private int maxmicrostep_ ; + /** + * uint32 maxmicrostep = 5; + */ + public int getMaxmicrostep() { + return maxmicrostep_; + } + /** + * uint32 maxmicrostep = 5; + */ + public Builder setMaxmicrostep(int value) { + + maxmicrostep_ = value; + onChanged(); + return this; + } + /** + * uint32 maxmicrostep = 5; + */ + public Builder clearMaxmicrostep() { + + maxmicrostep_ = 0; + onChanged(); + return this; + } + + private double linearratio_ ; + /** + * double linearratio = 6; + */ + public double getLinearratio() { + return linearratio_; + } + /** + * double linearratio = 6; + */ + public Builder setLinearratio(double value) { + + linearratio_ = value; + onChanged(); + return this; + } + /** + * double linearratio = 6; + */ + public Builder clearLinearratio() { + + linearratio_ = 0D; + onChanged(); + return this; + } + + private int medianposition_ ; + /** + * uint32 medianposition = 7; + */ + public int getMedianposition() { + return medianposition_; + } + /** + * uint32 medianposition = 7; + */ + public Builder setMedianposition(int value) { + + medianposition_ = value; + onChanged(); + return this; + } + /** + * uint32 medianposition = 7; + */ + public Builder clearMedianposition() { + + medianposition_ = 0; + onChanged(); + return this; + } + + private double correctiongain_ ; + /** + * double correctiongain = 8; + */ + public double getCorrectiongain() { + return correctiongain_; + } + /** + * double correctiongain = 8; + */ + public Builder setCorrectiongain(double value) { + + correctiongain_ = value; + onChanged(); + return this; + } + /** + * double correctiongain = 8; + */ + public Builder clearCorrectiongain() { + + correctiongain_ = 0D; + onChanged(); + return this; + } + + private double ration2Dryerspd_ ; + /** + * double ration2dryerspd = 9; + */ + public double getRation2Dryerspd() { + return ration2Dryerspd_; + } + /** + * double ration2dryerspd = 9; + */ + public Builder setRation2Dryerspd(double value) { + + ration2Dryerspd_ = value; + onChanged(); + return this; + } + /** + * double ration2dryerspd = 9; + */ + public Builder clearRation2Dryerspd() { + + ration2Dryerspd_ = 0D; + onChanged(); + return this; + } + + private double kp_ ; + /** + * double Kp = 10; + */ + public double getKp() { + return kp_; + } + /** + * double Kp = 10; + */ + public Builder setKp(double value) { + + kp_ = value; + onChanged(); + return this; + } + /** + * double Kp = 10; + */ + public Builder clearKp() { + + kp_ = 0D; + onChanged(); + return this; + } + + private double ki_ ; + /** + * double Ki = 11; + */ + public double getKi() { + return ki_; + } + /** + * double Ki = 11; + */ + public Builder setKi(double value) { + + ki_ = value; + onChanged(); + return this; + } + /** + * double Ki = 11; + */ + public Builder clearKi() { + + ki_ = 0D; + onChanged(); + return this; + } + + private double kd_ ; + /** + * double Kd = 12; + */ + public double getKd() { + return kd_; + } + /** + * double Kd = 12; + */ + public Builder setKd(double value) { + + kd_ = value; + onChanged(); + return this; + } + /** + * double Kd = 12; + */ + public Builder clearKd() { + + kd_ = 0D; + onChanged(); + return this; + } + + private double changeSlope_ ; + /** + * double changeSlope = 13; + */ + public double getChangeSlope() { + return changeSlope_; + } + /** + * double changeSlope = 13; + */ + public Builder setChangeSlope(double value) { + + changeSlope_ = value; + onChanged(); + return this; + } + /** + * double changeSlope = 13; + */ + public Builder clearChangeSlope() { + + changeSlope_ = 0D; + onChanged(); + return this; + } + + private double hightimeoutmSec_ ; + /** + * double hightimeoutmSec = 14; + */ + public double getHightimeoutmSec() { + return hightimeoutmSec_; + } + /** + * double hightimeoutmSec = 14; + */ + public Builder setHightimeoutmSec(double value) { + + hightimeoutmSec_ = value; + onChanged(); + return this; + } + /** + * double hightimeoutmSec = 14; + */ + public Builder clearHightimeoutmSec() { + + hightimeoutmSec_ = 0D; + onChanged(); + return this; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:Tango.PMR.Jobs.MotorConfig) + } + + // @@protoc_insertion_point(class_scope:Tango.PMR.Jobs.MotorConfig) + private static final com.twine.tango.pmr.jobs.Motor.MotorConfig DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.twine.tango.pmr.jobs.Motor.MotorConfig(); + } + + public static com.twine.tango.pmr.jobs.Motor.MotorConfig getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + public MotorConfig parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new MotorConfig(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public com.twine.tango.pmr.jobs.Motor.MotorConfig getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_Tango_PMR_Jobs_MotorConfig_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_Tango_PMR_Jobs_MotorConfig_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n\013motor.proto\022\016Tango.PMR.Jobs\"\260\002\n\013MotorC" + + "onfig\022#\n\002Id\030\001 \001(\0162\027.Tango.PMR.Jobs.Motor" + + "Id\022\017\n\007minfreq\030\002 \001(\r\022\017\n\007maxfreq\030\003 \001(\r\022\024\n\014" + + "minmicrostep\030\004 \001(\r\022\024\n\014maxmicrostep\030\005 \001(\r" + + "\022\023\n\013linearratio\030\006 \001(\001\022\026\n\016medianposition\030" + + "\007 \001(\r\022\026\n\016correctiongain\030\010 \001(\001\022\027\n\017ration2" + + "dryerspd\030\t \001(\001\022\n\n\002Kp\030\n \001(\001\022\n\n\002Ki\030\013 \001(\001\022\n" + + "\n\002Kd\030\014 \001(\001\022\023\n\013changeSlope\030\r \001(\001\022\027\n\017hight" + + "imeoutmSec\030\016 \001(\001*8\n\007MotorId\022\n\n\006Feeder\020\000\022" + + "\t\n\005Dryer\020\001\022\n\n\006Pooler\020\002\022\n\n\006Winder\020\003B\032\n\030co", + "m.twine.tango.pmr.jobsb\006proto3" + }; + com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = + new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { + public com.google.protobuf.ExtensionRegistry assignDescriptors( + com.google.protobuf.Descriptors.FileDescriptor root) { + descriptor = root; + return null; + } + }; + com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + }, assigner); + internal_static_Tango_PMR_Jobs_MotorConfig_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_Tango_PMR_Jobs_MotorConfig_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_Tango_PMR_Jobs_MotorConfig_descriptor, + new java.lang.String[] { "Id", "Minfreq", "Maxfreq", "Minmicrostep", "Maxmicrostep", "Linearratio", "Medianposition", "Correctiongain", "Ration2Dryerspd", "Kp", "Ki", "Kd", "ChangeSlope", "HightimeoutmSec", }); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/jobs/SegmentOuterClass.java b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/jobs/SegmentOuterClass.java index eb19e884e..629204d61 100644 --- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/jobs/SegmentOuterClass.java +++ b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/jobs/SegmentOuterClass.java @@ -45,6 +45,30 @@ public final class SegmentOuterClass { * .Tango.PMR.Common.RGB Color = 3; */ com.twine.tango.pmr.common.RGBOuterClass.RGBOrBuilder getColorOrBuilder(); + + /** + * repeated .Tango.PMR.Jobs.Dispense dispenser = 4; + */ + java.util.List + getDispenserList(); + /** + * repeated .Tango.PMR.Jobs.Dispense dispenser = 4; + */ + com.twine.tango.pmr.jobs.Dispenser.Dispense getDispenser(int index); + /** + * repeated .Tango.PMR.Jobs.Dispense dispenser = 4; + */ + int getDispenserCount(); + /** + * repeated .Tango.PMR.Jobs.Dispense dispenser = 4; + */ + java.util.List + getDispenserOrBuilderList(); + /** + * repeated .Tango.PMR.Jobs.Dispense dispenser = 4; + */ + com.twine.tango.pmr.jobs.Dispenser.DispenseOrBuilder getDispenserOrBuilder( + int index); } /** * Protobuf type {@code Tango.PMR.Jobs.Segment} @@ -61,6 +85,7 @@ public final class SegmentOuterClass { private Segment() { name_ = ""; length_ = 0; + dispenser_ = java.util.Collections.emptyList(); } @java.lang.Override @@ -115,6 +140,15 @@ public final class SegmentOuterClass { break; } + case 34: { + if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + dispenser_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000008; + } + dispenser_.add( + input.readMessage(com.twine.tango.pmr.jobs.Dispenser.Dispense.parser(), extensionRegistry)); + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -123,6 +157,9 @@ public final class SegmentOuterClass { throw new com.google.protobuf.InvalidProtocolBufferException( e).setUnfinishedMessage(this); } finally { + if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + dispenser_ = java.util.Collections.unmodifiableList(dispenser_); + } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } @@ -139,6 +176,7 @@ public final class SegmentOuterClass { com.twine.tango.pmr.jobs.SegmentOuterClass.Segment.class, com.twine.tango.pmr.jobs.SegmentOuterClass.Segment.Builder.class); } + private int bitField0_; public static final int NAME_FIELD_NUMBER = 1; private volatile java.lang.Object name_; /** @@ -203,6 +241,41 @@ public final class SegmentOuterClass { return getColor(); } + public static final int DISPENSER_FIELD_NUMBER = 4; + private java.util.List dispenser_; + /** + * repeated .Tango.PMR.Jobs.Dispense dispenser = 4; + */ + public java.util.List getDispenserList() { + return dispenser_; + } + /** + * repeated .Tango.PMR.Jobs.Dispense dispenser = 4; + */ + public java.util.List + getDispenserOrBuilderList() { + return dispenser_; + } + /** + * repeated .Tango.PMR.Jobs.Dispense dispenser = 4; + */ + public int getDispenserCount() { + return dispenser_.size(); + } + /** + * repeated .Tango.PMR.Jobs.Dispense dispenser = 4; + */ + public com.twine.tango.pmr.jobs.Dispenser.Dispense getDispenser(int index) { + return dispenser_.get(index); + } + /** + * repeated .Tango.PMR.Jobs.Dispense dispenser = 4; + */ + public com.twine.tango.pmr.jobs.Dispenser.DispenseOrBuilder getDispenserOrBuilder( + int index) { + return dispenser_.get(index); + } + private byte memoizedIsInitialized = -1; public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; @@ -224,6 +297,9 @@ public final class SegmentOuterClass { if (color_ != null) { output.writeMessage(3, getColor()); } + for (int i = 0; i < dispenser_.size(); i++) { + output.writeMessage(4, dispenser_.get(i)); + } unknownFields.writeTo(output); } @@ -243,6 +319,10 @@ public final class SegmentOuterClass { size += com.google.protobuf.CodedOutputStream .computeMessageSize(3, getColor()); } + for (int i = 0; i < dispenser_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(4, dispenser_.get(i)); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -268,6 +348,8 @@ public final class SegmentOuterClass { result = result && getColor() .equals(other.getColor()); } + result = result && getDispenserList() + .equals(other.getDispenserList()); result = result && unknownFields.equals(other.unknownFields); return result; } @@ -287,6 +369,10 @@ public final class SegmentOuterClass { hash = (37 * hash) + COLOR_FIELD_NUMBER; hash = (53 * hash) + getColor().hashCode(); } + if (getDispenserCount() > 0) { + hash = (37 * hash) + DISPENSER_FIELD_NUMBER; + hash = (53 * hash) + getDispenserList().hashCode(); + } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -412,6 +498,7 @@ public final class SegmentOuterClass { private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessageV3 .alwaysUseFieldBuilders) { + getDispenserFieldBuilder(); } } public Builder clear() { @@ -426,6 +513,12 @@ public final class SegmentOuterClass { color_ = null; colorBuilder_ = null; } + if (dispenserBuilder_ == null) { + dispenser_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000008); + } else { + dispenserBuilder_.clear(); + } return this; } @@ -448,6 +541,8 @@ public final class SegmentOuterClass { public com.twine.tango.pmr.jobs.SegmentOuterClass.Segment buildPartial() { com.twine.tango.pmr.jobs.SegmentOuterClass.Segment result = new com.twine.tango.pmr.jobs.SegmentOuterClass.Segment(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; result.name_ = name_; result.length_ = length_; if (colorBuilder_ == null) { @@ -455,6 +550,16 @@ public final class SegmentOuterClass { } else { result.color_ = colorBuilder_.build(); } + if (dispenserBuilder_ == null) { + if (((bitField0_ & 0x00000008) == 0x00000008)) { + dispenser_ = java.util.Collections.unmodifiableList(dispenser_); + bitField0_ = (bitField0_ & ~0x00000008); + } + result.dispenser_ = dispenser_; + } else { + result.dispenser_ = dispenserBuilder_.build(); + } + result.bitField0_ = to_bitField0_; onBuilt(); return result; } @@ -506,6 +611,32 @@ public final class SegmentOuterClass { if (other.hasColor()) { mergeColor(other.getColor()); } + if (dispenserBuilder_ == null) { + if (!other.dispenser_.isEmpty()) { + if (dispenser_.isEmpty()) { + dispenser_ = other.dispenser_; + bitField0_ = (bitField0_ & ~0x00000008); + } else { + ensureDispenserIsMutable(); + dispenser_.addAll(other.dispenser_); + } + onChanged(); + } + } else { + if (!other.dispenser_.isEmpty()) { + if (dispenserBuilder_.isEmpty()) { + dispenserBuilder_.dispose(); + dispenserBuilder_ = null; + dispenser_ = other.dispenser_; + bitField0_ = (bitField0_ & ~0x00000008); + dispenserBuilder_ = + com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? + getDispenserFieldBuilder() : null; + } else { + dispenserBuilder_.addAllMessages(other.dispenser_); + } + } + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -532,6 +663,7 @@ public final class SegmentOuterClass { } return this; } + private int bitField0_; private java.lang.Object name_ = ""; /** @@ -744,6 +876,246 @@ public final class SegmentOuterClass { } return colorBuilder_; } + + private java.util.List dispenser_ = + java.util.Collections.emptyList(); + private void ensureDispenserIsMutable() { + if (!((bitField0_ & 0x00000008) == 0x00000008)) { + dispenser_ = new java.util.ArrayList(dispenser_); + bitField0_ |= 0x00000008; + } + } + + private com.google.protobuf.RepeatedFieldBuilderV3< + com.twine.tango.pmr.jobs.Dispenser.Dispense, com.twine.tango.pmr.jobs.Dispenser.Dispense.Builder, com.twine.tango.pmr.jobs.Dispenser.DispenseOrBuilder> dispenserBuilder_; + + /** + * repeated .Tango.PMR.Jobs.Dispense dispenser = 4; + */ + public java.util.List getDispenserList() { + if (dispenserBuilder_ == null) { + return java.util.Collections.unmodifiableList(dispenser_); + } else { + return dispenserBuilder_.getMessageList(); + } + } + /** + * repeated .Tango.PMR.Jobs.Dispense dispenser = 4; + */ + public int getDispenserCount() { + if (dispenserBuilder_ == null) { + return dispenser_.size(); + } else { + return dispenserBuilder_.getCount(); + } + } + /** + * repeated .Tango.PMR.Jobs.Dispense dispenser = 4; + */ + public com.twine.tango.pmr.jobs.Dispenser.Dispense getDispenser(int index) { + if (dispenserBuilder_ == null) { + return dispenser_.get(index); + } else { + return dispenserBuilder_.getMessage(index); + } + } + /** + * repeated .Tango.PMR.Jobs.Dispense dispenser = 4; + */ + public Builder setDispenser( + int index, com.twine.tango.pmr.jobs.Dispenser.Dispense value) { + if (dispenserBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureDispenserIsMutable(); + dispenser_.set(index, value); + onChanged(); + } else { + dispenserBuilder_.setMessage(index, value); + } + return this; + } + /** + * repeated .Tango.PMR.Jobs.Dispense dispenser = 4; + */ + public Builder setDispenser( + int index, com.twine.tango.pmr.jobs.Dispenser.Dispense.Builder builderForValue) { + if (dispenserBuilder_ == null) { + ensureDispenserIsMutable(); + dispenser_.set(index, builderForValue.build()); + onChanged(); + } else { + dispenserBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .Tango.PMR.Jobs.Dispense dispenser = 4; + */ + public Builder addDispenser(com.twine.tango.pmr.jobs.Dispenser.Dispense value) { + if (dispenserBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureDispenserIsMutable(); + dispenser_.add(value); + onChanged(); + } else { + dispenserBuilder_.addMessage(value); + } + return this; + } + /** + * repeated .Tango.PMR.Jobs.Dispense dispenser = 4; + */ + public Builder addDispenser( + int index, com.twine.tango.pmr.jobs.Dispenser.Dispense value) { + if (dispenserBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureDispenserIsMutable(); + dispenser_.add(index, value); + onChanged(); + } else { + dispenserBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .Tango.PMR.Jobs.Dispense dispenser = 4; + */ + public Builder addDispenser( + com.twine.tango.pmr.jobs.Dispenser.Dispense.Builder builderForValue) { + if (dispenserBuilder_ == null) { + ensureDispenserIsMutable(); + dispenser_.add(builderForValue.build()); + onChanged(); + } else { + dispenserBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .Tango.PMR.Jobs.Dispense dispenser = 4; + */ + public Builder addDispenser( + int index, com.twine.tango.pmr.jobs.Dispenser.Dispense.Builder builderForValue) { + if (dispenserBuilder_ == null) { + ensureDispenserIsMutable(); + dispenser_.add(index, builderForValue.build()); + onChanged(); + } else { + dispenserBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .Tango.PMR.Jobs.Dispense dispenser = 4; + */ + public Builder addAllDispenser( + java.lang.Iterable values) { + if (dispenserBuilder_ == null) { + ensureDispenserIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, dispenser_); + onChanged(); + } else { + dispenserBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .Tango.PMR.Jobs.Dispense dispenser = 4; + */ + public Builder clearDispenser() { + if (dispenserBuilder_ == null) { + dispenser_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000008); + onChanged(); + } else { + dispenserBuilder_.clear(); + } + return this; + } + /** + * repeated .Tango.PMR.Jobs.Dispense dispenser = 4; + */ + public Builder removeDispenser(int index) { + if (dispenserBuilder_ == null) { + ensureDispenserIsMutable(); + dispenser_.remove(index); + onChanged(); + } else { + dispenserBuilder_.remove(index); + } + return this; + } + /** + * repeated .Tango.PMR.Jobs.Dispense dispenser = 4; + */ + public com.twine.tango.pmr.jobs.Dispenser.Dispense.Builder getDispenserBuilder( + int index) { + return getDispenserFieldBuilder().getBuilder(index); + } + /** + * repeated .Tango.PMR.Jobs.Dispense dispenser = 4; + */ + public com.twine.tango.pmr.jobs.Dispenser.DispenseOrBuilder getDispenserOrBuilder( + int index) { + if (dispenserBuilder_ == null) { + return dispenser_.get(index); } else { + return dispenserBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .Tango.PMR.Jobs.Dispense dispenser = 4; + */ + public java.util.List + getDispenserOrBuilderList() { + if (dispenserBuilder_ != null) { + return dispenserBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(dispenser_); + } + } + /** + * repeated .Tango.PMR.Jobs.Dispense dispenser = 4; + */ + public com.twine.tango.pmr.jobs.Dispenser.Dispense.Builder addDispenserBuilder() { + return getDispenserFieldBuilder().addBuilder( + com.twine.tango.pmr.jobs.Dispenser.Dispense.getDefaultInstance()); + } + /** + * repeated .Tango.PMR.Jobs.Dispense dispenser = 4; + */ + public com.twine.tango.pmr.jobs.Dispenser.Dispense.Builder addDispenserBuilder( + int index) { + return getDispenserFieldBuilder().addBuilder( + index, com.twine.tango.pmr.jobs.Dispenser.Dispense.getDefaultInstance()); + } + /** + * repeated .Tango.PMR.Jobs.Dispense dispenser = 4; + */ + public java.util.List + getDispenserBuilderList() { + return getDispenserFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilderV3< + com.twine.tango.pmr.jobs.Dispenser.Dispense, com.twine.tango.pmr.jobs.Dispenser.Dispense.Builder, com.twine.tango.pmr.jobs.Dispenser.DispenseOrBuilder> + getDispenserFieldBuilder() { + if (dispenserBuilder_ == null) { + dispenserBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< + com.twine.tango.pmr.jobs.Dispenser.Dispense, com.twine.tango.pmr.jobs.Dispenser.Dispense.Builder, com.twine.tango.pmr.jobs.Dispenser.DispenseOrBuilder>( + dispenser_, + ((bitField0_ & 0x00000008) == 0x00000008), + getParentForChildren(), + isClean()); + dispenser_ = null; + } + return dispenserBuilder_; + } public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); @@ -808,9 +1180,11 @@ public final class SegmentOuterClass { static { java.lang.String[] descriptorData = { "\n\rSegment.proto\022\016Tango.PMR.Jobs\032\tRGB.pro" + - "to\"M\n\007Segment\022\014\n\004Name\030\001 \001(\t\022\016\n\006Length\030\002 " + - "\001(\005\022$\n\005Color\030\003 \001(\0132\025.Tango.PMR.Common.RG" + - "BB\032\n\030com.twine.tango.pmr.jobsb\006proto3" + "to\032\017dispenser.proto\"z\n\007Segment\022\014\n\004Name\030\001" + + " \001(\t\022\016\n\006Length\030\002 \001(\005\022$\n\005Color\030\003 \001(\0132\025.Ta" + + "ngo.PMR.Common.RGB\022+\n\tdispenser\030\004 \003(\0132\030." + + "Tango.PMR.Jobs.DispenseB\032\n\030com.twine.tan" + + "go.pmr.jobsb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -824,14 +1198,16 @@ public final class SegmentOuterClass { .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { com.twine.tango.pmr.common.RGBOuterClass.getDescriptor(), + com.twine.tango.pmr.jobs.Dispenser.getDescriptor(), }, assigner); internal_static_Tango_PMR_Jobs_Segment_descriptor = getDescriptor().getMessageTypes().get(0); internal_static_Tango_PMR_Jobs_Segment_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_Tango_PMR_Jobs_Segment_descriptor, - new java.lang.String[] { "Name", "Length", "Color", }); + new java.lang.String[] { "Name", "Length", "Color", "Dispenser", }); com.twine.tango.pmr.common.RGBOuterClass.getDescriptor(); + com.twine.tango.pmr.jobs.Dispenser.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/Software/Android_Studio/Tango.PMR/src/main/res/raw/packages.txt b/Software/Android_Studio/Tango.PMR/src/main/res/raw/packages.txt index 7dcb7e0f1..8633ab3c5 100644 --- a/Software/Android_Studio/Tango.PMR/src/main/res/raw/packages.txt +++ b/Software/Android_Studio/Tango.PMR/src/main/res/raw/packages.txt @@ -1,4 +1,5 @@ common +diagnostics integration jobs stubs diff --git a/Software/DB/Tango.db b/Software/DB/Tango.db index 2aafcab0e..147c930c6 100644 Binary files a/Software/DB/Tango.db and b/Software/DB/Tango.db differ diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf index a8a07a2f0..0e29193ec 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 a0a6f87d4..a437a0c1e 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/Tango.MachineStudio.DB/Converters/EventTypeActionsToStringConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/EventTypeActionsToStringConverter.cs index 278802863..5cdee0153 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/EventTypeActionsToStringConverter.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/EventTypeActionsToStringConverter.cs @@ -23,7 +23,7 @@ namespace Tango.MachineStudio.DB.Converters if (value is IEnumerable) { IEnumerable eventActions = value as IEnumerable; - return String.Join(", ", eventActions.Where(x => !x.Deleted).Select(x => x.ActionTypes.Name)); + return String.Join(", ", eventActions.Select(x => x.ActionTypes.Name)); } else { diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/LiquidTypeRmlsToStringConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/LiquidTypeRmlsToStringConverter.cs index 05ffa684c..a8e82b69b 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/LiquidTypeRmlsToStringConverter.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/LiquidTypeRmlsToStringConverter.cs @@ -23,7 +23,7 @@ namespace Tango.MachineStudio.DB.Converters if (value is IEnumerable) { IEnumerable liquidRmls = value as IEnumerable; - return String.Join(", ", liquidRmls.Where(x => !x.Deleted).Select(x => x.Rml.Name)); + return String.Join(", ", liquidRmls.Select(x => x.Rml.Name)); } else { diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/RolesPermissionsToStringConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/RolesPermissionsToStringConverter.cs index 6ad99213d..96c4d7d7d 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/RolesPermissionsToStringConverter.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/RolesPermissionsToStringConverter.cs @@ -24,7 +24,7 @@ namespace Tango.MachineStudio.DB.Converters if (value is IEnumerable) { IEnumerable rolesPermissions = value as IEnumerable; - return String.Join(", ", rolesPermissions.Where(x => !x.Deleted).Select(x => x.Permission.Name)); + return String.Join(", ", rolesPermissions.Select(x => x.Permission.Name)); } else { diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs index bc8d54ce9..a3d3e2486 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs @@ -156,21 +156,20 @@ namespace Tango.MachineStudio.DB.ViewModels { using (_notification.PushTaskItem("Saving changes to database...")) { - var dependenctEntities = SelectedEntity.GetDependentEntitiesNameAndGuid(); + //var dependenctEntities = SelectedEntity.GetDependentEntitiesNameAndGuid(); - if (dependenctEntities.Count > 0) - { - _notification.ShowError("The selected entity is being used by " + dependenctEntities.Count + " other entities." + Environment.NewLine + "Please delete any dependencies and try again." + Environment.NewLine + Environment.NewLine + String.Join(Environment.NewLine, dependenctEntities.Select(x => x.Key + ", ID: " + x.Value))); - return; - } + //if (dependenctEntities.Count > 0) + //{ + // _notification.ShowError("The selected entity is being used by " + dependenctEntities.Count + " other entities." + Environment.NewLine + "Please delete any dependencies and try again." + Environment.NewLine + Environment.NewLine + String.Join(Environment.NewLine, dependenctEntities.Select(x => x.Key + ", ID: " + x.Value))); + // return; + //} try { - await SelectedEntity.SoftDeleteAsync(); + await SelectedEntity.DeleteAsync(); } catch (Exception ex) { - SelectedEntity.Deleted = false; Adapter.Invalidate(); _notification.ShowError("Could not delete entity."); } 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 index 69e3c9ff6..0325e42ee 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesViewVM.cs @@ -29,7 +29,7 @@ namespace Tango.MachineStudio.DB.ViewModels foreach (var actionType in SelectedActions) { - if (SelectedEntity.EventTypesActions.ToList().Exists(x => x.ActionTypes == actionType.Entity && !x.Deleted)) + if (SelectedEntity.EventTypesActions.ToList().Exists(x => x.ActionTypes == actionType.Entity)) { actionType.IsSelected = true; } @@ -51,24 +51,23 @@ namespace Tango.MachineStudio.DB.ViewModels foreach (var actionType in SelectedActions) { - var userRole = eventType.EventTypesActions.SingleOrDefault(x => x.ActionTypes == actionType.Entity); + var eventTypeAction = eventType.EventTypesActions.SingleOrDefault(x => x.ActionTypes == actionType.Entity); - if (userRole != null) + if (eventTypeAction != null && !actionType.IsSelected) { - userRole.Deleted = !actionType.IsSelected; + eventTypeAction.Delete(); + continue; } - else + + if (actionType.IsSelected) { - if (actionType.IsSelected) + eventType.EventTypesActions.Add(new EventTypesAction() { - eventType.EventTypesActions.Add(new EventTypesAction() - { - ActionTypes = actionType.Entity, - EventTypes = eventType, - ActionTypeGuid = actionType.Entity.Guid, - EventTypeGuid = eventType.Guid - }); - } + ActionTypes = actionType.Entity, + EventTypes = eventType, + ActionTypeGuid = actionType.Entity.Guid, + EventTypeGuid = eventType.Guid + }); } } } diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LiquidTypesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LiquidTypesViewVM.cs index eaa482a41..49bd18822 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LiquidTypesViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LiquidTypesViewVM.cs @@ -29,7 +29,7 @@ namespace Tango.MachineStudio.DB.ViewModels foreach (var rml in SelectedRmls) { - if (SelectedEntity.LiquidTypesRmls.ToList().Exists(x => x.Rml == rml.Entity && !x.Deleted)) + if (SelectedEntity.LiquidTypesRmls.ToList().Exists(x => x.Rml == rml.Entity)) { rml.IsSelected = true; } @@ -53,22 +53,21 @@ namespace Tango.MachineStudio.DB.ViewModels { var liquidRml = liquid.LiquidTypesRmls.SingleOrDefault(x => x.Rml == rml.Entity); - if (liquidRml != null) + if (liquidRml != null && !rml.IsSelected) { - liquidRml.Deleted = !rml.IsSelected; + liquidRml.Delete(); + continue; } - else + + if (rml.IsSelected) { - if (rml.IsSelected) + liquid.LiquidTypesRmls.Add(new LiquidTypesRml() { - liquid.LiquidTypesRmls.Add(new LiquidTypesRml() - { - Rml = rml.Entity, - LiquidTypes = liquid, - RmlGuid = rml.Entity.Guid, - LiquidTypeGuid = liquid.Guid - }); - } + Rml = rml.Entity, + LiquidTypes = liquid, + RmlGuid = rml.Entity.Guid, + LiquidTypeGuid = liquid.Guid + }); } } } diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/RolesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/RolesViewVM.cs index d09722ec9..8ce95f736 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/RolesViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/RolesViewVM.cs @@ -30,7 +30,7 @@ namespace Tango.MachineStudio.DB.ViewModels foreach (var permission in SelectedPermissions) { - if (SelectedEntity.RolesPermissions.ToList().Exists(x => x.Permission == permission.Entity && !x.Deleted)) + if (SelectedEntity.RolesPermissions.ToList().Exists(x => x.Permission == permission.Entity)) { permission.IsSelected = true; } @@ -54,22 +54,21 @@ namespace Tango.MachineStudio.DB.ViewModels { var rolePermission = role.RolesPermissions.SingleOrDefault(x => x.Permission == permission.Entity); - if (rolePermission != null) + if (rolePermission != null && !permission.IsSelected) { - rolePermission.Deleted = !permission.IsSelected; + rolePermission.Delete(); + continue; } - else + + if (permission.IsSelected) { - if (permission.IsSelected) + role.RolesPermissions.Add(new RolesPermission() { - role.RolesPermissions.Add(new RolesPermission() - { - Permission = permission.Entity, - Role = role, - PermissionGuid = permission.Entity.Guid, - RoleGuid = role.Guid - }); - } + Permission = permission.Entity, + Role = role, + PermissionGuid = permission.Entity.Guid, + RoleGuid = role.Guid + }); } } } diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPackView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPackView.xaml index 699a9ceb6..543e6b40c 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPackView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPackView.xaml @@ -28,11 +28,11 @@ - - + + - , + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPacksView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPacksView.xaml index 4a35b1900..e5043e3e2 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPacksView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPacksView.xaml @@ -22,10 +22,10 @@ - + - , + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/AutoComplete/MachineVersionsProvider.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/AutoComplete/MachineVersionsProvider.cs new file mode 100644 index 000000000..51ca629a4 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/AutoComplete/MachineVersionsProvider.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.AutoComplete.Editors; +using Tango.DAL.Observables; + +namespace Tango.MachineStudio.MachineDesigner.AutoComplete +{ + /// + /// Represents an auto-complete Machine Versions provider. + /// + /// + public class MachineVersionsProvider : ISuggestionProvider + { + public String Text { get; set; } + + public IEnumerable GetSuggestions(string filter) + { + Text = filter; + return ObservablesEntitiesAdapter.Instance.MachineVersions.Where(x => x.Version.ToString().StartsWith(filter, StringComparison.CurrentCultureIgnoreCase) || x.Name.StartsWith(filter, StringComparison.CurrentCultureIgnoreCase)).ToList(); + } + } +} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj index 46ec20fdc..ac1616401 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj @@ -78,8 +78,13 @@ + + + + MachineVersionDialog.xaml + MainView.xaml @@ -87,6 +92,10 @@ GlobalVersionInfo.cs + + Designer + MSBuild:Compile + Designer MSBuild:Compile diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineVersionDialogVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineVersionDialogVM.cs new file mode 100644 index 000000000..6854472f1 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineVersionDialogVM.cs @@ -0,0 +1,61 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.Core.Commands; +using Tango.DAL.Observables; +using Tango.MachineStudio.Common.Notifications; +using Tango.MachineStudio.MachineDesigner.AutoComplete; + +namespace Tango.MachineStudio.MachineDesigner.ViewModels +{ + public class MachineVersionDialogVM : DialogViewVM + { + public MachineVersionsProvider VersionsProvider { get; set; } + + public double Version { get; set; } + + private String _versionName; + + public String VersionName + { + get { return _versionName; } + set { _versionName = value; RaisePropertyChangedAuto(); } + } + + private MachineVersion _selectedVersion; + + public MachineVersion SelectedVersion + { + get { return _selectedVersion; } + set + { + _selectedVersion = value; + RaisePropertyChangedAuto(); + VersionName = value != null ? value.Name : null; + Version = value != null ? value.Version : 0; + } + } + + public RelayCommand AcceptCommand { get; set; } + + public RelayCommand CancelCommand { get; set; } + + public MachineVersionDialogVM() + { + VersionsProvider = new MachineVersionsProvider(); + AcceptCommand = new RelayCommand(() => + { + if (SelectedVersion == null) + { + Version = double.Parse(VersionsProvider.Text); + } + + Accept(); + + }); + CancelCommand = new RelayCommand(Cancel); + } + } +} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs index 96b66c204..24f2f6d43 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs @@ -123,6 +123,16 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels /// public RelayCommand RemoveIdsCommand { get; set; } + /// + /// Gets or sets the set version configuration command. + /// + public RelayCommand SetVersionConfigurationCommand { get; set; } + + /// + /// Gets or sets the set as default command. + /// + public RelayCommand SetAsDefaultCommand { get; set; } + #endregion #region Constructors @@ -143,6 +153,8 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels SaveCommand = new RelayCommand(Save, (x) => !_isSaving); AddIdsCommand = new RelayCommand(AddIds, (x) => !_isSaving && Configuration.IdsPacks.Count < 8); RemoveIdsCommand = new RelayCommand(RemoveIds, (x) => !_isSaving && SelectedIds != null); + SetVersionConfigurationCommand = new RelayCommand(SetVersionConfiguration,(x) => !_isSaving); + SetAsDefaultCommand = new RelayCommand(SetAsDefaultConfiguration,(x) => !_isSaving); } #endregion @@ -563,6 +575,61 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels History.Insert(0, machine.Configuration); } + /// + /// Sets the current configuration to the selected machine version default configuration. + /// + private void SetVersionConfiguration() + { + if (Machine.MachineVersions != null) + { + Configuration = Machine.MachineVersions.Configuration.CloneConfiguration(); + } + else + { + _notification.ShowError("No machine version selected."); + } + } + + /// + /// Sets the current configuration as a default machine version configuration. + /// + private void SetAsDefaultConfiguration() + { + _notification.ShowModalDialog(async (vm) => + { + try + { + using (_notification.PushTaskItem("Saving Default Configuration...")) + { + if (vm.SelectedVersion != null) + { + vm.SelectedVersion.Configuration = Configuration.CloneConfiguration(); + vm.SelectedVersion.DefaultConfigurationGuid = vm.SelectedVersion.Configuration.Guid; + await vm.SelectedVersion.SaveAsync(); + } + else + { + MachineVersion newVersion = new MachineVersion(); + newVersion.Version = vm.Version; + newVersion.Name = vm.VersionName; + + newVersion.Configuration = Configuration.CloneConfiguration(); + newVersion.DefaultConfigurationGuid = newVersion.Configuration.Guid; + await newVersion.SaveAsync(); + } + } + } + catch (Exception ex) + { + _notification.ShowError(ex.Message); + } + + }, () => + { + + }); + } + #endregion } } diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineVersionDialog.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineVersionDialog.xaml new file mode 100644 index 000000000..60aebef7f --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineVersionDialog.xaml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Version + + + + , + + + + + + + Name + + + + + + + + + + + + + + + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineVersionDialog.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineVersionDialog.xaml.cs new file mode 100644 index 000000000..3d59d7cda --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineVersionDialog.xaml.cs @@ -0,0 +1,28 @@ +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.MachineDesigner.Views +{ + /// + /// Interaction logic for MachineVersionDialog.xaml + /// + public partial class MachineVersionDialog : UserControl + { + public MachineVersionDialog() + { + InitializeComponent(); + } + } +} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml index 8f955beea..605b66a05 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml @@ -431,7 +431,7 @@ - + @@ -447,7 +447,14 @@ Machine Version - + + + + + + + + Organization @@ -806,12 +813,24 @@ - + + + + + + + + diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs index 8ca933397..448625f27 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs @@ -166,6 +166,10 @@ namespace Tango.MachineStudio.UI.Notifications view.Loaded += (x, y) => { VM context = view.DataContext as VM; + if (context == null) + { + context = Activator.CreateInstance(); + } dialog.DataContext = context; Action onAcceptAction = null; diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/ACTION_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/ACTION_TYPES.cs index a0297f529..7ff535d35 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/ACTION_TYPES.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/ACTION_TYPES.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Local.DB public long ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public long CODE { get; set; } public string NAME { get; set; } public string DESCRIPTION { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/APPLICATION_DISPLAY_PANEL_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/APPLICATION_DISPLAY_PANEL_VERSIONS.cs index 410d0309c..29a652b80 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/APPLICATION_DISPLAY_PANEL_VERSIONS.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/APPLICATION_DISPLAY_PANEL_VERSIONS.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Local.DB public long ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public double VERSION { get; set; } public string NAME { get; set; } } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/APPLICATION_FIRMWARE_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/APPLICATION_FIRMWARE_VERSIONS.cs index dca8e82f1..dc5527468 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/APPLICATION_FIRMWARE_VERSIONS.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/APPLICATION_FIRMWARE_VERSIONS.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Local.DB public long ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public double VERSION { get; set; } public string NAME { get; set; } } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/APPLICATION_OS_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/APPLICATION_OS_VERSIONS.cs index c05a2410c..1c3af40e0 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/APPLICATION_OS_VERSIONS.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/APPLICATION_OS_VERSIONS.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Local.DB public long ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public double VERSION { get; set; } public string NAME { get; set; } } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/APPLICATION_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/APPLICATION_VERSIONS.cs index c250201d0..bdd0fa8a8 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/APPLICATION_VERSIONS.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/APPLICATION_VERSIONS.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Local.DB public long ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public double VERSION { get; set; } public string NAME { get; set; } } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/CARTRIDGE_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/CARTRIDGE_TYPES.cs index 6d8e2d441..ce5c33442 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/CARTRIDGE_TYPES.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/CARTRIDGE_TYPES.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Local.DB public long ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public long CODE { get; set; } public string NAME { get; set; } } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/CAT.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/CAT.cs index c46de78a5..8b610ca97 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/CAT.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/CAT.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Local.DB public long ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public string LIQUID_TYPE_GUID { get; set; } public string MACHINE_GUID { get; set; } public byte[] DATA { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/CCT.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/CCT.cs index fc71ebf27..a44251468 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/CCT.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/CCT.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Local.DB public long ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public string NAME { get; set; } public string DESCRIPTION { get; set; } public string FORWARD_FILE_NAME { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/CONFIGURATION.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/CONFIGURATION.cs index b17564a48..bbefb6dff 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/CONFIGURATION.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/CONFIGURATION.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Local.DB public long ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public string NAME { get; set; } public System.DateTime CREATION_DATE { get; set; } public string APPLICATION_VERSION_GUID { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/DISPENSER_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/DISPENSER_TYPES.cs index 0d8094f81..a2af8f1fe 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/DISPENSER_TYPES.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/DISPENSER_TYPES.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Local.DB public long ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public long CODE { get; set; } public string NAME { get; set; } public double NL_PER_PULSE { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/EMBEDDED_FIRMWARE_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/EMBEDDED_FIRMWARE_VERSIONS.cs index b4f3c3c85..33e37676e 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/EMBEDDED_FIRMWARE_VERSIONS.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/EMBEDDED_FIRMWARE_VERSIONS.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Local.DB public long ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public double VERSION { get; set; } public string NAME { get; set; } } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/EMBEDDED_SOFTWARE_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/EMBEDDED_SOFTWARE_VERSIONS.cs index 117295091..e85e5702c 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/EMBEDDED_SOFTWARE_VERSIONS.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/EMBEDDED_SOFTWARE_VERSIONS.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Local.DB public long ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public double VERSION { get; set; } public string NAME { get; set; } } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/EVENT_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/EVENT_TYPES.cs index af7b10d05..5420add49 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/EVENT_TYPES.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/EVENT_TYPES.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Local.DB public long ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public long CODE { get; set; } public string NAME { get; set; } public string DESCRIPTION { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/EVENT_TYPES_ACTIONS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/EVENT_TYPES_ACTIONS.cs index 0e7ba0913..bb751a464 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/EVENT_TYPES_ACTIONS.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/EVENT_TYPES_ACTIONS.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Local.DB public long ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public string EVENT_TYPE_GUID { get; set; } public string ACTION_TYPE_GUID { get; set; } } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/FIBER_SHAPES.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/FIBER_SHAPES.cs index 5dd3efc31..304030fc2 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/FIBER_SHAPES.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/FIBER_SHAPES.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Local.DB public long ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public string NAME { get; set; } public long CODE { get; set; } } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/FIBER_SYNTHS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/FIBER_SYNTHS.cs index 27a67a9fa..3010e8756 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/FIBER_SYNTHS.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/FIBER_SYNTHS.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Local.DB public long ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public string NAME { get; set; } public long CODE { get; set; } } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/HARDWARE_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/HARDWARE_VERSIONS.cs index 62b93a878..eaa862f33 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/HARDWARE_VERSIONS.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/HARDWARE_VERSIONS.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Local.DB public long ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public double VERSION { get; set; } public string NAME { get; set; } } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/IDS_PACKS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/IDS_PACKS.cs index e2a9c4425..8da598c46 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/IDS_PACKS.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/IDS_PACKS.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Local.DB public long ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public string CONFIGURATION_GUID { get; set; } public string DISPENSER_TYPE_GUID { get; set; } public string LIQUID_TYPE_GUID { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LINEAR_MASS_DENSITY_UNITS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/LINEAR_MASS_DENSITY_UNITS.cs index c0c5ff8c6..de881b40c 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/LINEAR_MASS_DENSITY_UNITS.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LINEAR_MASS_DENSITY_UNITS.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Local.DB public long ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public string NAME { get; set; } public long CODE { get; set; } } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID_TYPES.cs index 16e069ef1..d16e78826 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID_TYPES.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID_TYPES.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Local.DB public long ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public long CODE { get; set; } public string NAME { get; set; } public double VERSION { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID_TYPES_RMLS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID_TYPES_RMLS.cs index 637b61e01..1beb1e217 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID_TYPES_RMLS.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LIQUID_TYPES_RMLS.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Local.DB public long ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public string LIQUID_TYPE_GUID { get; set; } public string RML_GUID { get; set; } public double MAX_NL_PER_CM { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx index 60f35f27c..9fb01760a 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx @@ -12,7 +12,6 @@ - @@ -40,7 +39,6 @@ - @@ -51,7 +49,6 @@ - @@ -62,7 +59,6 @@ - @@ -73,7 +69,6 @@ - @@ -84,7 +79,6 @@ - @@ -95,7 +89,6 @@ - @@ -107,7 +100,6 @@ - @@ -124,7 +116,6 @@ - @@ -157,7 +148,6 @@ - @@ -170,7 +160,6 @@ - @@ -181,7 +170,6 @@ - @@ -192,7 +180,6 @@ - @@ -204,7 +191,6 @@ - @@ -215,7 +201,6 @@ - @@ -226,7 +211,6 @@ - @@ -237,7 +221,6 @@ - @@ -248,7 +231,6 @@ - @@ -264,7 +246,6 @@ - @@ -275,7 +256,6 @@ - @@ -288,7 +268,6 @@ - @@ -300,7 +279,6 @@ - @@ -312,7 +290,6 @@ - @@ -327,7 +304,6 @@ - @@ -338,7 +314,6 @@ - @@ -352,7 +327,6 @@ - @@ -362,7 +336,6 @@ - @@ -373,7 +346,6 @@ - @@ -384,7 +356,6 @@ - @@ -395,7 +366,6 @@ - @@ -407,7 +377,6 @@ - @@ -419,7 +388,6 @@ - @@ -431,7 +399,6 @@ - @@ -459,7 +426,6 @@ - @@ -471,7 +437,6 @@ - @@ -603,7 +568,6 @@ - @@ -631,7 +595,6 @@ - @@ -642,7 +605,6 @@ - @@ -653,7 +615,6 @@ - @@ -664,7 +625,6 @@ - @@ -675,7 +635,6 @@ - @@ -686,7 +645,6 @@ - @@ -698,7 +656,6 @@ - @@ -715,7 +672,6 @@ - @@ -748,7 +704,6 @@ - @@ -761,7 +716,6 @@ - @@ -772,7 +726,6 @@ - @@ -783,7 +736,6 @@ - @@ -795,7 +747,6 @@ - @@ -806,7 +757,6 @@ - @@ -817,7 +767,6 @@ - @@ -828,7 +777,6 @@ - @@ -839,7 +787,6 @@ - @@ -855,7 +802,6 @@ - @@ -866,7 +812,6 @@ - @@ -879,7 +824,6 @@ - @@ -891,7 +835,6 @@ - @@ -903,7 +846,6 @@ - @@ -918,7 +860,6 @@ - @@ -929,7 +870,6 @@ - @@ -943,7 +883,6 @@ - @@ -953,7 +892,6 @@ - @@ -964,7 +902,6 @@ - @@ -975,7 +912,6 @@ - @@ -986,7 +922,6 @@ - @@ -998,7 +933,6 @@ - @@ -1010,7 +944,6 @@ - @@ -1022,7 +955,6 @@ - @@ -1050,7 +982,6 @@ - @@ -1062,7 +993,6 @@ - @@ -1111,7 +1041,6 @@ - @@ -1140,7 +1069,6 @@ - @@ -1152,7 +1080,6 @@ - @@ -1164,7 +1091,6 @@ - @@ -1176,7 +1102,6 @@ - @@ -1188,7 +1113,6 @@ - @@ -1201,7 +1125,6 @@ - @@ -1219,7 +1142,6 @@ - @@ -1238,7 +1160,6 @@ - @@ -1268,7 +1189,6 @@ - @@ -1280,7 +1200,6 @@ - @@ -1292,7 +1211,6 @@ - @@ -1305,7 +1223,6 @@ - @@ -1317,7 +1234,6 @@ - @@ -1329,7 +1245,6 @@ - @@ -1341,7 +1256,6 @@ - @@ -1353,7 +1267,6 @@ - @@ -1370,7 +1283,6 @@ - @@ -1382,7 +1294,6 @@ - @@ -1396,7 +1307,6 @@ - @@ -1409,7 +1319,6 @@ - @@ -1422,7 +1331,6 @@ - @@ -1438,7 +1346,6 @@ - @@ -1450,7 +1357,6 @@ - @@ -1465,7 +1371,6 @@ - @@ -1476,7 +1381,6 @@ - @@ -1488,7 +1392,6 @@ - @@ -1500,7 +1403,6 @@ - @@ -1512,7 +1414,6 @@ - @@ -1525,7 +1426,6 @@ - @@ -1538,7 +1438,6 @@ - @@ -1551,7 +1450,6 @@ - @@ -1580,7 +1478,6 @@ - @@ -1593,7 +1490,6 @@ - @@ -1605,7 +1501,6 @@ - diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram index 2d0a148ea..06fe3fd60 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram @@ -13,38 +13,38 @@ - - - - - - - - + + + + + + + + - - - - + + + + - - - + + + - - - - + + + + diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINE.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINE.cs index 7bf83f80c..dd46b5ab6 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINE.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINE.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Local.DB public long ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public string SERIAL_NUMBER { get; set; } public string NAME { get; set; } public System.DateTime PRODUCTION_DATE { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINES_CONFIGURATIONS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINES_CONFIGURATIONS.cs index 64bff8f15..974094a37 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINES_CONFIGURATIONS.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINES_CONFIGURATIONS.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Local.DB public long ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public string MACHINE_GUID { get; set; } public string CONFIGURATION_GUID { get; set; } } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINES_EVENTS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINES_EVENTS.cs index 2b916274a..c6a009e8a 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINES_EVENTS.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINES_EVENTS.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Local.DB public long ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public string MACHINE_GUID { get; set; } public string EVENT_TYPE_GUID { get; set; } public string USER_GUID { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINE_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINE_VERSIONS.cs index 482c5ff01..8507deef3 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINE_VERSIONS.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/MACHINE_VERSIONS.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Local.DB public long ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public string NAME { get; set; } public double VERSION { get; set; } public string DEFAULT_CONFIGURATION_GUID { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/MEDIA_COLORS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/MEDIA_COLORS.cs index d4da68404..a7619286e 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/MEDIA_COLORS.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/MEDIA_COLORS.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Local.DB public long ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public long COLOR { get; set; } } } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/MEDIA_CONDITIONS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/MEDIA_CONDITIONS.cs index 368913189..46e6e9836 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/MEDIA_CONDITIONS.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/MEDIA_CONDITIONS.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Local.DB public long ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public string NAME { get; set; } public long CODE { get; set; } } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/MEDIA_MATERIALS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/MEDIA_MATERIALS.cs index fdf51b12e..f04bfa105 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/MEDIA_MATERIALS.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/MEDIA_MATERIALS.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Local.DB public long ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public string NAME { get; set; } public long CODE { get; set; } } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/MEDIA_PURPOSES.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/MEDIA_PURPOSES.cs index 15ea7c140..19fac3d1b 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/MEDIA_PURPOSES.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/MEDIA_PURPOSES.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Local.DB public long ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public string NAME { get; set; } public long CODE { get; set; } } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/MID_TANK_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/MID_TANK_TYPES.cs index 75eb1ba64..ee3ffbcea 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/MID_TANK_TYPES.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/MID_TANK_TYPES.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Local.DB public long ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public long CODE { get; set; } public string NAME { get; set; } public double LITER_CAPACITY { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/ORGANIZATION.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/ORGANIZATION.cs index 8ff5faa2f..6e42825e4 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/ORGANIZATION.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/ORGANIZATION.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Local.DB public long ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public string NAME { get; set; } public string CONTACT_GUID { get; set; } public string ADDRESS_GUID { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/PERMISSION.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/PERMISSION.cs index 6052bccc0..dc4b2b654 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/PERMISSION.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/PERMISSION.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Local.DB public long ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public long CODE { get; set; } public string NAME { get; set; } public string DESCRIPTION { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/RML.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/RML.cs index d84850194..acadec6a9 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/RML.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/RML.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Local.DB public long ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public string NAME { get; set; } public string MANUFACTURER { get; set; } public string MATERIAL_GUID { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/ROLE.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/ROLE.cs index 66f453b4e..7dc8669ca 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/ROLE.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/ROLE.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Local.DB public long ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public long CODE { get; set; } public string NAME { get; set; } public string DESCRIPTION { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/ROLES_PERMISSIONS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/ROLES_PERMISSIONS.cs index d63343b82..6a20ac604 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/DB/ROLES_PERMISSIONS.cs +++ b/Software/Visual_Studio/Tango.DAL.Local/DB/ROLES_PERMISSIONS.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Local.DB public long ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public string ROLE_GUID { get; set; } public string PERMISSION_GUID { get; set; } } diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Address.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Address.cs index ad1786fed..020c3a3c2 100644 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Address.cs +++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Address.cs @@ -10,6 +10,25 @@ namespace Tango.DAL.Observables public partial class Address : ObservableEntity
{ + private Boolean _deleted; + /// + /// Gets or sets the address deleted. + /// + [EntityFieldName("DELETED")] + public Boolean Deleted + { + get + { + return _deleted; + } + + set + { + _deleted = value; RaisePropertyChanged(nameof(Deleted)); + } + + } + private String _addressstring; /// /// Gets or sets the address address string. diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Contact.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Contact.cs index 9f8ec680b..0356d44b5 100644 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Contact.cs +++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Contact.cs @@ -10,6 +10,25 @@ namespace Tango.DAL.Observables public partial class Contact : ObservableEntity { + private Boolean _deleted; + /// + /// Gets or sets the contact deleted. + /// + [EntityFieldName("DELETED")] + public Boolean Deleted + { + get + { + return _deleted; + } + + set + { + _deleted = value; RaisePropertyChanged(nameof(Deleted)); + } + + } + private String _firstname; /// /// Gets or sets the contact first name. diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/User.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/User.cs index a7fc315d3..210488ac4 100644 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/User.cs +++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/User.cs @@ -10,6 +10,25 @@ namespace Tango.DAL.Observables public partial class User : ObservableEntity { + private Boolean _deleted; + /// + /// Gets or sets the user deleted. + /// + [EntityFieldName("DELETED")] + public Boolean Deleted + { + get + { + return _deleted; + } + + set + { + _deleted = value; RaisePropertyChanged(nameof(Deleted)); + } + + } + private String _email; /// /// Gets or sets the user email. diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/UsersRole.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/UsersRole.cs index 2001d86f1..782c296e3 100644 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/UsersRole.cs +++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/UsersRole.cs @@ -10,6 +10,25 @@ namespace Tango.DAL.Observables public partial class UsersRole : ObservableEntity { + private Boolean _deleted; + /// + /// Gets or sets the usersrole deleted. + /// + [EntityFieldName("DELETED")] + public Boolean Deleted + { + get + { + return _deleted; + } + + set + { + _deleted = value; RaisePropertyChanged(nameof(Deleted)); + } + + } + private String _userguid; /// /// Gets or sets the usersrole user guid. diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/MidTankTypes.cs b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/MidTankTypes.cs index a2515c714..a2571f577 100644 --- a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/MidTankTypes.cs +++ b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/MidTankTypes.cs @@ -10,10 +10,10 @@ namespace Tango.DAL.Observables { /// - /// (2 Liter Tank) + /// (Liter Tank 2) /// - [Description("2 Liter Tank")] - 2LiterTank = 1, + [Description("Liter Tank 2")] + LiterTank2 = 1, } } diff --git a/Software/Visual_Studio/Tango.DAL.Observables/IObservableEntity.cs b/Software/Visual_Studio/Tango.DAL.Observables/IObservableEntity.cs index 027b385c9..71da4fa7c 100644 --- a/Software/Visual_Studio/Tango.DAL.Observables/IObservableEntity.cs +++ b/Software/Visual_Studio/Tango.DAL.Observables/IObservableEntity.cs @@ -30,12 +30,6 @@ namespace Tango.DAL.Observables [EntityFieldName("LAST_UPDATED")] DateTime LastUpdated { get; set; } - /// - /// Gets or sets a value indicating whether this is deleted. - /// - [EntityFieldName("DELETED")] - bool Deleted { get; set; } - /// /// Saves the changes on this entity to database. /// @@ -48,20 +42,19 @@ namespace Tango.DAL.Observables Task SaveAsync(); /// - /// Deletes this entity from the database (Do no use this). + /// Deletes this entity from the database. /// - [Obsolete("The method delete is not for use as it prevents the synchronization of remote and local database.")] void Delete(); /// - /// Performs a "soft delete" of this entity (Set to true and save). + /// Removed this entity from it's DB SET without saving changes. /// void SoftDelete(); /// - /// Performs a "soft delete" of this entity asynchronously (Set to true and save). + /// Deletes this entity from the database. /// - Task SoftDeleteAsync(); + Task DeleteAsync(); /// /// Gets a collection of entities which are dependent on this entity. diff --git a/Software/Visual_Studio/Tango.DAL.Observables/ObservableEntity.cs b/Software/Visual_Studio/Tango.DAL.Observables/ObservableEntity.cs index 2cc9ad097..e8a99cea6 100644 --- a/Software/Visual_Studio/Tango.DAL.Observables/ObservableEntity.cs +++ b/Software/Visual_Studio/Tango.DAL.Observables/ObservableEntity.cs @@ -40,11 +40,6 @@ namespace Tango.DAL.Observables /// public abstract DateTime LastUpdated { get; set; } - /// - /// Gets or sets a value indicating whether this is deleted. - /// - public abstract bool Deleted { get; set; } - /// /// Saves the changes on this entity to database. /// @@ -57,26 +52,25 @@ namespace Tango.DAL.Observables internal abstract void Save(List savedEntities); /// - /// Deletes this entity from the database (Do no use this). + /// Deletes this entity from the database. /// public abstract void Delete(); /// - /// Saves the changes on this entity to database asynchronously. + /// Removed this entity from it's DB SET without saving changes. /// - /// - public abstract Task SaveAsync(); + public abstract void SoftDelete(); /// - /// Performs a "soft delete" of this entity (Set to true and save). + /// Deletes this entity from the database /// - public abstract void SoftDelete(); + public abstract Task DeleteAsync(); /// - /// Performs a "soft delete" of this entity asynchronously (Set to true and save). + /// Saves the changes on this entity to database asynchronously. /// /// - public abstract Task SoftDeleteAsync(); + public abstract Task SaveAsync(); /// /// Converts the specified database conventional name to the observables conventional name. @@ -266,17 +260,6 @@ namespace Tango.DAL.Observables set { _lastUpdated = value; RaisePropertyChanged(nameof(LastUpdated)); } } - private bool _deleted; - /// - /// Gets or sets a value indicating whether this is deleted. - /// - [EntityFieldName("DELETED")] - public override bool Deleted - { - get { return _deleted; } - set { _deleted = value; RaisePropertyChanged(nameof(Deleted)); } - } - /// /// Initializes a new instance of the class. /// @@ -324,41 +307,53 @@ namespace Tango.DAL.Observables } /// - /// Deletes this entity from the database (Do no use this). + /// Deletes this entity from the database /// public override void Delete() { - String tabelName = this.GetType().GetDALName(); - DbSet dbSet = typeof(RemoteDB).GetProperty(tabelName).GetValue(ObservablesEntitiesAdapter.Instance.Context) as DbSet; - dbSet.Remove(Entity); - ObservablesEntitiesAdapter.Instance.SaveChanges(); + var delProp = this.GetType().GetProperty("Deleted"); + + if (delProp != null) + { + delProp.SetValue(this, true); + Save(); + } + else + { + String tabelName = this.GetType().GetDALName(); + DbSet dbSet = typeof(RemoteDB).GetProperty(tabelName).GetValue(ObservablesEntitiesAdapter.Instance.Context) as DbSet; + dbSet.Remove(Entity); + ObservablesEntitiesAdapter.Instance.SaveChanges(); + } } /// - /// Performs a "soft delete" of this entity (Set to true and save). + /// Removed this entity from it's DB SET without saving changes. /// public override void SoftDelete() { - if (!SettingsManager.Default.DataBase.DeleteForReal) + var delProp = this.GetType().GetProperty("IsDeleted"); + + if (delProp != null) { - this.Deleted = true; - Save(); + delProp.SetValue(this, true); } else { - Delete(); + String tabelName = this.GetType().GetDALName(); + DbSet dbSet = typeof(RemoteDB).GetProperty(tabelName).GetValue(ObservablesEntitiesAdapter.Instance.Context) as DbSet; + dbSet.Remove(Entity); } } /// - /// Performs a "soft delete" of this entity asynchronously (Set to true and save). + /// Deletes this entity from the database /// - /// - public override Task SoftDeleteAsync() + public override Task DeleteAsync() { - return Task.Factory.StartNew(() => + return Task.Factory.StartNew(() => { - SoftDelete(); + Delete(); }); } diff --git a/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapter.cs b/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapter.cs index 384f10dc7..a5ed56530 100644 --- a/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapter.cs +++ b/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapter.cs @@ -85,9 +85,9 @@ namespace Tango.DAL.Observables { Context.SaveChanges(); } - catch + catch (Exception ex) { - throw; + throw ex; } finally { @@ -151,27 +151,27 @@ namespace Tango.DAL.Observables //Remove Unlinked Configurations.. } - Organizations = Context.ORGANIZATIONS.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); + Organizations = Context.ORGANIZATIONS.ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); OrganizationsViewSource = CreateCollectionView(Organizations); - Machines = Context.MACHINES.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); + Machines = Context.MACHINES.ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); foreach (var machine in Machines) { machine.MachinesConfigurations = machine.MachinesConfigurations.OrderByDescending(x => x.Configuration.CreationDate).Take(30).ToObservableCollection(); } - MachinesConfigurations = Context.MACHINES_CONFIGURATIONS.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); + MachinesConfigurations = Context.MACHINES_CONFIGURATIONS.ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); - MachineVersions = Context.MACHINE_VERSIONS.Where(x => !x.DELETED).ToList().OrderBy(x => x.VERSION).Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); + MachineVersions = Context.MACHINE_VERSIONS.ToList().OrderBy(x => x.VERSION).Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); Addresses = Context.ADDRESSES.Where(x => !x.DELETED).ToList().OrderBy(x => x.ADDRESS_STRING).Select(x => ObservableEntity.CreateObservableFromEntity
(x)).ToObservableCollection(); Contacts = Context.CONTACTS.Where(x => !x.DELETED).ToList().OrderBy(x => x.FULL_NAME).Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); - Roles = Context.ROLES.Where(x => !x.DELETED).ToList().OrderBy(x => x.NAME).Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); + Roles = Context.ROLES.ToList().OrderBy(x => x.NAME).Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); - Permissions = Context.PERMISSIONS.Where(x => !x.DELETED).ToList().OrderBy(x => x.NAME).Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); + Permissions = Context.PERMISSIONS.ToList().OrderBy(x => x.NAME).Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); Users = Context.USERS.Where(x => !x.DELETED).ToList().OrderBy(x => x.CONTACT.FULL_NAME).Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); @@ -182,70 +182,70 @@ namespace Tango.DAL.Observables foreach (var role in Roles) { - role.RolesPermissions = role.RolesPermissions.Where(x => !x.Deleted).ToObservableCollection(); + role.RolesPermissions = role.RolesPermissions.ToObservableCollection(); } - Configurations = Context.CONFIGURATIONS.Where(x => !x.DELETED).ToList().OrderBy(x => x.LAST_UPDATED).Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); + Configurations = Context.CONFIGURATIONS.ToList().OrderBy(x => x.LAST_UPDATED).Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); foreach (var config in Configurations) { - config.IdsPacks = config.IdsPacks.Where(x => !x.Deleted).ToObservableCollection(); + config.IdsPacks = config.IdsPacks.ToObservableCollection(); } - ApplicationVersions = Context.APPLICATION_VERSIONS.Where(x => !x.DELETED).ToList().OrderBy(x => x.VERSION).Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); + ApplicationVersions = Context.APPLICATION_VERSIONS.ToList().OrderBy(x => x.VERSION).Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); - ApplicationOsVersions = Context.APPLICATION_OS_VERSIONS.Where(x => !x.DELETED).ToList().OrderBy(x => x.VERSION).Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); + ApplicationOsVersions = Context.APPLICATION_OS_VERSIONS.ToList().OrderBy(x => x.VERSION).Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); - ApplicationFirmwareVersions = Context.APPLICATION_FIRMWARE_VERSIONS.Where(x => !x.DELETED).ToList().OrderBy(x => x.VERSION).Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); + ApplicationFirmwareVersions = Context.APPLICATION_FIRMWARE_VERSIONS.ToList().OrderBy(x => x.VERSION).Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); - ApplicationDisplayPanelVersions = Context.APPLICATION_DISPLAY_PANEL_VERSIONS.Where(x => !x.DELETED).ToList().OrderBy(x => x.VERSION).Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); + ApplicationDisplayPanelVersions = Context.APPLICATION_DISPLAY_PANEL_VERSIONS.ToList().OrderBy(x => x.VERSION).Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); - EmbeddedFirmwareVersions = Context.EMBEDDED_FIRMWARE_VERSIONS.Where(x => !x.DELETED).ToList().OrderBy(x => x.VERSION).Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); + EmbeddedFirmwareVersions = Context.EMBEDDED_FIRMWARE_VERSIONS.ToList().OrderBy(x => x.VERSION).Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); - EmbeddedSoftwareVersions = Context.EMBEDDED_SOFTWARE_VERSIONS.Where(x => !x.DELETED).ToList().OrderBy(x => x.VERSION).Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); + EmbeddedSoftwareVersions = Context.EMBEDDED_SOFTWARE_VERSIONS.ToList().OrderBy(x => x.VERSION).Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); - HardwareVersions = Context.HARDWARE_VERSIONS.Where(x => !x.DELETED).ToList().OrderBy(x => x.VERSION).Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); + HardwareVersions = Context.HARDWARE_VERSIONS.ToList().OrderBy(x => x.VERSION).Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); - IdsPacks = Context.IDS_PACKS.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); + IdsPacks = Context.IDS_PACKS.ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); - DispenserTypes = Context.DISPENSER_TYPES.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); + DispenserTypes = Context.DISPENSER_TYPES.ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); - LiquidTypes = Context.LIQUID_TYPES.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); + LiquidTypes = Context.LIQUID_TYPES.ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); - CartridgeTypes = Context.CARTRIDGE_TYPES.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); + CartridgeTypes = Context.CARTRIDGE_TYPES.ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); - MidTankTypes = Context.MID_TANK_TYPES.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); + MidTankTypes = Context.MID_TANK_TYPES.ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); - ActionTypes = Context.ACTION_TYPES.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); + ActionTypes = Context.ACTION_TYPES.ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); - EventTypes = Context.EVENT_TYPES.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); + EventTypes = Context.EVENT_TYPES.ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); foreach (var eventType in EventTypes) { - eventType.EventTypesActions = eventType.EventTypesActions.Where(x => !x.Deleted).ToObservableCollection(); + eventType.EventTypesActions = eventType.EventTypesActions.ToObservableCollection(); } - MediaMaterials = Context.MEDIA_MATERIALS.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); + MediaMaterials = Context.MEDIA_MATERIALS.ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); - MediaColors = Context.MEDIA_COLORS.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); + MediaColors = Context.MEDIA_COLORS.ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); - MediaPurposes = Context.MEDIA_PURPOSES.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); + MediaPurposes = Context.MEDIA_PURPOSES.ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); - MediaConditions = Context.MEDIA_CONDITIONS.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); + MediaConditions = Context.MEDIA_CONDITIONS.ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); - LinearMassDensityUnits = Context.LINEAR_MASS_DENSITY_UNITS.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); + LinearMassDensityUnits = Context.LINEAR_MASS_DENSITY_UNITS.ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); - FiberShapes = Context.FIBER_SHAPES.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); + FiberShapes = Context.FIBER_SHAPES.ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); - FiberSynths = Context.FIBER_SYNTHS.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); + FiberSynths = Context.FIBER_SYNTHS.ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); - Rmls = Context.RMLS.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); + Rmls = Context.RMLS.ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); - LiquidTypesRmls = Context.LIQUID_TYPES_RMLS.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); + LiquidTypesRmls = Context.LIQUID_TYPES_RMLS.ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); - Ccts = Context.CCTS.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); + Ccts = Context.CCTS.ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); - Cats = Context.CATS.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); + Cats = Context.CATS.ToList().Select(x => ObservableEntity.CreateObservableFromEntity(x)).ToObservableCollection(); InitCollectionSources(); diff --git a/Software/Visual_Studio/Tango.DAL.Observables/ObservablesGenerator.cs b/Software/Visual_Studio/Tango.DAL.Observables/ObservablesGenerator.cs index c0dcf8662..53f27c9ba 100644 --- a/Software/Visual_Studio/Tango.DAL.Observables/ObservablesGenerator.cs +++ b/Software/Visual_Studio/Tango.DAL.Observables/ObservablesGenerator.cs @@ -34,7 +34,7 @@ namespace Tango.DAL.Observables TableName = table.Name, }; - foreach (var field in table.PropertyType.GenericTypeArguments.First().GetProperties().Skip(4)) + foreach (var field in table.PropertyType.GenericTypeArguments.First().GetProperties().Skip(3)) { EntityCodeFileField codeField = new EntityCodeFileField(); codeField.FieldName = field.Name; @@ -149,12 +149,12 @@ namespace Tango.DAL.Observables - foreach (var field in table.PropertyType.GenericTypeArguments.First().GetProperties().Skip(4).Where(x => !x.Name.Contains("GUID"))) + foreach (var field in table.PropertyType.GenericTypeArguments.First().GetProperties().Skip(3).Where(x => !x.Name.Contains("GUID"))) { EntityCodeFileField codeField = new EntityCodeFileField(); - codeField.FieldName = field.Name.Singularize(false); - codeField.Name = ObservableEntity.DalNameToStandardName(field.Name.Singularize(false)); - codeField.Description = FirstCharacterToLower(ObservableEntity.DalNameToStandardName(field.Name).Singularize(false)); + codeField.FieldName = field.Name; + codeField.Name = ObservableEntity.DalNameToStandardName(field.Name); + codeField.Description = FirstCharacterToLower(ObservableEntity.DalNameToStandardName(field.Name)); if (field.PropertyType.IsGenericType) @@ -163,11 +163,15 @@ namespace Tango.DAL.Observables } else { - if (field.PropertyType.IsClass && field.PropertyType != typeof(String)) + if (field.PropertyType.IsClass && field.PropertyType != typeof(String) && field.PropertyType != typeof(Byte[])) { codeField.Type = ObservableEntity.DalNameToStandardName(field.PropertyType.Name).Singularize(false); codeField.Construct = true; } + else if (field.PropertyType == typeof(Byte[])) + { + codeField.Type = field.PropertyType.Name.ToLower(); + } else { codeField.Type = field.PropertyType.Name == "Int32" ? "int" : field.PropertyType.Name; diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Partials/Machine.cs b/Software/Visual_Studio/Tango.DAL.Observables/Partials/Machine.cs new file mode 100644 index 000000000..71c1eeaee --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Observables/Partials/Machine.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.DAL.Observables +{ + public partial class Machine + { + /// + /// Deletes this entity from the database + /// + public override void Delete() + { + foreach (var machine_config in MachinesConfigurations) + { + machine_config.SoftDelete(); + machine_config.Configuration.SoftDelete(); + } + + base.SoftDelete(); + + ObservablesEntitiesAdapter.Instance.SaveChanges(); + } + } +} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Partials/MachineVersion.cs b/Software/Visual_Studio/Tango.DAL.Observables/Partials/MachineVersion.cs new file mode 100644 index 000000000..95f4b0d69 --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Observables/Partials/MachineVersion.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.DAL.Observables +{ + public partial class MachineVersion + { + public override void Delete() + { + Configuration.SoftDelete(); + base.SoftDelete(); + + ObservablesEntitiesAdapter.Instance.SaveChanges(); + } + } +} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Partials/User.cs b/Software/Visual_Studio/Tango.DAL.Observables/Partials/User.cs index 2781a34be..805c389fc 100644 --- a/Software/Visual_Studio/Tango.DAL.Observables/Partials/User.cs +++ b/Software/Visual_Studio/Tango.DAL.Observables/Partials/User.cs @@ -25,7 +25,7 @@ namespace Tango.DAL.Observables ///
public List GetPermissions() { - return UsersRoles.Select(x => x.Role).ToList().SelectMany(x => x.RolesPermissions).Select(x => (Permissions)x.Permission.Code).ToList(); + return UsersRoles.Select(x => x.Role).ToList().SelectMany(x => x.RolesPermissions).Select(x => (Permissions)x.Permission.Code).ToList(); } /// diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Tango.DAL.Observables.csproj b/Software/Visual_Studio/Tango.DAL.Observables/Tango.DAL.Observables.csproj index c17fcbc93..95ed8bc63 100644 --- a/Software/Visual_Studio/Tango.DAL.Observables/Tango.DAL.Observables.csproj +++ b/Software/Visual_Studio/Tango.DAL.Observables/Tango.DAL.Observables.csproj @@ -87,6 +87,7 @@ + @@ -122,6 +123,7 @@ + diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/ACTION_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/ACTION_TYPES.cs index 1c71eb314..6a864f024 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/ACTION_TYPES.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/ACTION_TYPES.cs @@ -23,7 +23,6 @@ namespace Tango.DAL.Remote.DB public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public int CODE { get; set; } public string NAME { get; set; } public string DESCRIPTION { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/APPLICATION_DISPLAY_PANEL_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/APPLICATION_DISPLAY_PANEL_VERSIONS.cs index 5d5c329e0..ad55d5d82 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/APPLICATION_DISPLAY_PANEL_VERSIONS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/APPLICATION_DISPLAY_PANEL_VERSIONS.cs @@ -23,7 +23,6 @@ namespace Tango.DAL.Remote.DB public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public double VERSION { get; set; } public string NAME { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/APPLICATION_FIRMWARE_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/APPLICATION_FIRMWARE_VERSIONS.cs index 249dcfe2b..e24375a6f 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/APPLICATION_FIRMWARE_VERSIONS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/APPLICATION_FIRMWARE_VERSIONS.cs @@ -23,7 +23,6 @@ namespace Tango.DAL.Remote.DB public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public double VERSION { get; set; } public string NAME { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/APPLICATION_OS_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/APPLICATION_OS_VERSIONS.cs index 677e7f099..5839f5a8b 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/APPLICATION_OS_VERSIONS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/APPLICATION_OS_VERSIONS.cs @@ -23,7 +23,6 @@ namespace Tango.DAL.Remote.DB public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public double VERSION { get; set; } public string NAME { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/APPLICATION_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/APPLICATION_VERSIONS.cs index f5f0d29aa..620be2da0 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/APPLICATION_VERSIONS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/APPLICATION_VERSIONS.cs @@ -23,7 +23,6 @@ namespace Tango.DAL.Remote.DB public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public double VERSION { get; set; } public string NAME { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/CARTRIDGE_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/CARTRIDGE_TYPES.cs index cfead09a2..57bc2a101 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/CARTRIDGE_TYPES.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/CARTRIDGE_TYPES.cs @@ -23,7 +23,6 @@ namespace Tango.DAL.Remote.DB public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public int CODE { get; set; } public string NAME { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/CAT.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/CAT.cs index 162c39209..a9dafc33a 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/CAT.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/CAT.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Remote.DB public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public string LIQUID_TYPE_GUID { get; set; } public string MACHINE_GUID { get; set; } public byte[] DATA { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/CCT.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/CCT.cs index 9a420020b..87c657d50 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/CCT.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/CCT.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Remote.DB public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public string NAME { get; set; } public string DESCRIPTION { get; set; } public string FORWARD_FILE_NAME { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/CONFIGURATION.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/CONFIGURATION.cs index cfe748bc3..173463fff 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/CONFIGURATION.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/CONFIGURATION.cs @@ -26,7 +26,6 @@ namespace Tango.DAL.Remote.DB public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public string NAME { get; set; } public System.DateTime CREATION_DATE { get; set; } public string APPLICATION_VERSION_GUID { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER_TYPES.cs index 1bf5a8e0e..efe9286f2 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER_TYPES.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/DISPENSER_TYPES.cs @@ -23,7 +23,6 @@ namespace Tango.DAL.Remote.DB public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public int CODE { get; set; } public string NAME { get; set; } public double NL_PER_PULSE { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/EMBEDDED_FIRMWARE_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/EMBEDDED_FIRMWARE_VERSIONS.cs index 2ebc41626..df70c3cf2 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/EMBEDDED_FIRMWARE_VERSIONS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/EMBEDDED_FIRMWARE_VERSIONS.cs @@ -23,7 +23,6 @@ namespace Tango.DAL.Remote.DB public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public double VERSION { get; set; } public string NAME { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/EMBEDDED_SOFTWARE_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/EMBEDDED_SOFTWARE_VERSIONS.cs index 470cbaa49..6ae24f6a7 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/EMBEDDED_SOFTWARE_VERSIONS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/EMBEDDED_SOFTWARE_VERSIONS.cs @@ -23,7 +23,6 @@ namespace Tango.DAL.Remote.DB public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public double VERSION { get; set; } public string NAME { get; set; } 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 1eb478383..550cb87b1 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES.cs @@ -24,7 +24,6 @@ namespace Tango.DAL.Remote.DB public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public int CODE { get; set; } public string NAME { get; set; } public string DESCRIPTION { 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 index 003e4293e..3ce891623 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES_ACTIONS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES_ACTIONS.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Remote.DB public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public string EVENT_TYPE_GUID { get; set; } public string ACTION_TYPE_GUID { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/FIBER_SHAPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/FIBER_SHAPES.cs index 4e7bdf298..863a368e2 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/FIBER_SHAPES.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/FIBER_SHAPES.cs @@ -23,7 +23,6 @@ namespace Tango.DAL.Remote.DB public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public string NAME { get; set; } public int CODE { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/FIBER_SYNTHS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/FIBER_SYNTHS.cs index 885eff2c7..f2d340f47 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/FIBER_SYNTHS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/FIBER_SYNTHS.cs @@ -23,7 +23,6 @@ namespace Tango.DAL.Remote.DB public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public string NAME { get; set; } public int CODE { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_VERSIONS.cs index ba114fe3c..12974024e 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_VERSIONS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/HARDWARE_VERSIONS.cs @@ -23,7 +23,6 @@ namespace Tango.DAL.Remote.DB public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public double VERSION { get; set; } public string NAME { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/IDS_PACKS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/IDS_PACKS.cs index 24db64501..cddce2f6d 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/IDS_PACKS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/IDS_PACKS.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Remote.DB public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public string CONFIGURATION_GUID { get; set; } public string DISPENSER_TYPE_GUID { get; set; } public string LIQUID_TYPE_GUID { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/LINEAR_MASS_DENSITY_UNITS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/LINEAR_MASS_DENSITY_UNITS.cs index ac91c8c3e..5c0fb50fe 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/LINEAR_MASS_DENSITY_UNITS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/LINEAR_MASS_DENSITY_UNITS.cs @@ -23,7 +23,6 @@ namespace Tango.DAL.Remote.DB public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public string NAME { get; set; } public int CODE { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES.cs index 71f55585b..0e0b78e21 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES.cs @@ -25,7 +25,6 @@ namespace Tango.DAL.Remote.DB public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public int CODE { get; set; } public string NAME { get; set; } public double VERSION { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES_RMLS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES_RMLS.cs index 4a521f980..782f70d6c 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES_RMLS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES_RMLS.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Remote.DB public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public string LIQUID_TYPE_GUID { get; set; } public string RML_GUID { get; set; } public double MAX_NL_PER_CM { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs index bd54bbf4a..8963261a1 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs @@ -25,7 +25,6 @@ namespace Tango.DAL.Remote.DB public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public string SERIAL_NUMBER { get; set; } public string NAME { get; set; } public System.DateTime PRODUCTION_DATE { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINES_CONFIGURATIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINES_CONFIGURATIONS.cs index fbd2bfb20..2efe07680 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINES_CONFIGURATIONS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINES_CONFIGURATIONS.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Remote.DB public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public string MACHINE_GUID { get; set; } public string CONFIGURATION_GUID { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINES_EVENTS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINES_EVENTS.cs index 1f24cc1f9..6dae4b687 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINES_EVENTS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINES_EVENTS.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Remote.DB public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public string MACHINE_GUID { get; set; } public string EVENT_TYPE_GUID { get; set; } public string USER_GUID { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE_VERSIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE_VERSIONS.cs index a93d8e5b8..6c354d4bb 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE_VERSIONS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE_VERSIONS.cs @@ -23,7 +23,6 @@ namespace Tango.DAL.Remote.DB public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public double VERSION { get; set; } public string NAME { get; set; } public string DEFAULT_CONFIGURATION_GUID { 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 index 68a018f3a..c158b1770 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/MEDIA_COLORS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/MEDIA_COLORS.cs @@ -23,7 +23,6 @@ namespace Tango.DAL.Remote.DB public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public int COLOR { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/MEDIA_CONDITIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/MEDIA_CONDITIONS.cs index 844ece666..52c5edaab 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/MEDIA_CONDITIONS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/MEDIA_CONDITIONS.cs @@ -23,7 +23,6 @@ namespace Tango.DAL.Remote.DB public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public string NAME { get; set; } public int CODE { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/MEDIA_MATERIALS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/MEDIA_MATERIALS.cs index 80ede3e01..9f08788ac 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/MEDIA_MATERIALS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/MEDIA_MATERIALS.cs @@ -23,7 +23,6 @@ namespace Tango.DAL.Remote.DB public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public string NAME { get; set; } public int CODE { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/MEDIA_PURPOSES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/MEDIA_PURPOSES.cs index bd305011c..c540d2469 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/MEDIA_PURPOSES.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/MEDIA_PURPOSES.cs @@ -23,7 +23,6 @@ namespace Tango.DAL.Remote.DB public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public string NAME { get; set; } public int CODE { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/MID_TANK_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/MID_TANK_TYPES.cs index 52da42c25..dafe79a3b 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/MID_TANK_TYPES.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/MID_TANK_TYPES.cs @@ -23,7 +23,6 @@ namespace Tango.DAL.Remote.DB public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public int CODE { get; set; } public string NAME { get; set; } public double LITER_CAPACITY { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/ORGANIZATION.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/ORGANIZATION.cs index 3dd2c0738..e9837a775 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/ORGANIZATION.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/ORGANIZATION.cs @@ -24,7 +24,6 @@ namespace Tango.DAL.Remote.DB public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public string NAME { get; set; } public string CONTACT_GUID { get; set; } public string ADDRESS_GUID { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/PERMISSION.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/PERMISSION.cs index c342b49c0..4392a4b22 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/PERMISSION.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/PERMISSION.cs @@ -23,7 +23,6 @@ namespace Tango.DAL.Remote.DB public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public int CODE { get; set; } public string NAME { get; set; } public string DESCRIPTION { 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 ab1189e95..6120596e1 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs @@ -24,7 +24,6 @@ namespace Tango.DAL.Remote.DB public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public string NAME { get; set; } public string MANUFACTURER { get; set; } public string MATERIAL_GUID { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/ROLE.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/ROLE.cs index b2987c5f6..d4be1220c 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/ROLE.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/ROLE.cs @@ -24,7 +24,6 @@ namespace Tango.DAL.Remote.DB public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public int CODE { get; set; } public string NAME { get; set; } public string DESCRIPTION { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/ROLES_PERMISSIONS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/ROLES_PERMISSIONS.cs index b9c5ea451..850f784f8 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/ROLES_PERMISSIONS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/ROLES_PERMISSIONS.cs @@ -17,7 +17,6 @@ namespace Tango.DAL.Remote.DB public int ID { get; set; } public string GUID { get; set; } public System.DateTime LAST_UPDATED { get; set; } - public bool DELETED { get; set; } public string ROLE_GUID { get; set; } public string PERMISSION_GUID { 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 c1e7d53c4..ea19fea80 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx @@ -12,7 +12,6 @@ - @@ -40,7 +39,6 @@ - @@ -51,7 +49,6 @@ - @@ -62,7 +59,6 @@ - @@ -73,7 +69,6 @@ - @@ -84,7 +79,6 @@ - @@ -95,7 +89,6 @@ - @@ -107,7 +100,6 @@ - @@ -124,7 +116,6 @@ - @@ -157,7 +148,6 @@ - @@ -170,7 +160,6 @@ - @@ -181,7 +170,6 @@ - @@ -192,7 +180,6 @@ - @@ -204,7 +191,6 @@ - @@ -215,7 +201,6 @@ - @@ -226,7 +211,6 @@ - @@ -237,7 +221,6 @@ - @@ -248,7 +231,6 @@ - @@ -264,7 +246,6 @@ - @@ -275,7 +256,6 @@ - @@ -288,7 +268,6 @@ - @@ -300,7 +279,6 @@ - @@ -312,7 +290,6 @@ - @@ -327,7 +304,6 @@ - @@ -338,7 +314,6 @@ - @@ -352,7 +327,6 @@ - @@ -362,7 +336,6 @@ - @@ -373,7 +346,6 @@ - @@ -384,7 +356,6 @@ - @@ -395,7 +366,6 @@ - @@ -407,7 +377,6 @@ - @@ -419,7 +388,6 @@ - @@ -431,7 +399,6 @@ - @@ -459,7 +426,6 @@ - @@ -471,7 +437,6 @@ - @@ -714,8 +679,10 @@ - - + + + + @@ -726,8 +693,10 @@ - - + + + + @@ -1157,11 +1126,11 @@ - + - + @@ -1423,11 +1392,11 @@ - + - + @@ -1495,7 +1464,6 @@ - @@ -1526,7 +1494,6 @@ - @@ -1538,7 +1505,6 @@ - @@ -1550,7 +1516,6 @@ - @@ -1562,7 +1527,6 @@ - @@ -1574,7 +1538,6 @@ - @@ -1586,7 +1549,6 @@ - @@ -1600,7 +1562,6 @@ - @@ -1618,7 +1579,6 @@ - @@ -1664,7 +1624,6 @@ - @@ -1678,7 +1637,6 @@ - @@ -1690,7 +1648,6 @@ - @@ -1702,7 +1659,6 @@ - @@ -1716,7 +1672,6 @@ - @@ -1729,7 +1684,6 @@ - @@ -1741,7 +1695,6 @@ - @@ -1753,7 +1706,6 @@ - @@ -1765,7 +1717,6 @@ - @@ -1786,7 +1737,6 @@ - @@ -1798,14 +1748,13 @@ - - + @@ -1814,12 +1763,11 @@ - - - + + @@ -1828,7 +1776,6 @@ - @@ -1842,7 +1789,6 @@ - @@ -1863,7 +1809,6 @@ - @@ -1876,7 +1821,6 @@ - @@ -1893,7 +1837,6 @@ - @@ -1904,7 +1847,6 @@ - @@ -1916,7 +1858,6 @@ - @@ -1928,7 +1869,6 @@ - @@ -1940,7 +1880,6 @@ - @@ -1953,7 +1892,6 @@ - @@ -1969,7 +1907,6 @@ - @@ -1982,7 +1919,6 @@ - @@ -2006,7 +1942,7 @@ - + @@ -2019,7 +1955,6 @@ - @@ -2033,7 +1968,6 @@ - @@ -2421,8 +2355,10 @@ - - + + + + @@ -2433,8 +2369,10 @@ - - + + + + @@ -2631,7 +2569,6 @@ - @@ -2660,7 +2597,6 @@ - @@ -2672,7 +2608,6 @@ - @@ -2684,7 +2619,6 @@ - @@ -2696,7 +2630,6 @@ - @@ -2708,7 +2641,6 @@ - @@ -2721,7 +2653,6 @@ - @@ -2739,7 +2670,6 @@ - @@ -2758,7 +2688,6 @@ - @@ -2788,7 +2717,6 @@ - @@ -2800,7 +2728,6 @@ - @@ -2812,7 +2739,6 @@ - @@ -2825,7 +2751,6 @@ - @@ -2837,7 +2762,6 @@ - @@ -2849,7 +2773,6 @@ - @@ -2861,7 +2784,6 @@ - @@ -2873,7 +2795,6 @@ - @@ -2890,7 +2811,6 @@ - @@ -2902,7 +2822,6 @@ - @@ -2916,7 +2835,6 @@ - @@ -2929,7 +2847,6 @@ - @@ -2942,7 +2859,6 @@ - @@ -2958,7 +2874,6 @@ - @@ -2970,7 +2885,6 @@ - @@ -2985,7 +2899,6 @@ - @@ -2996,7 +2909,6 @@ - @@ -3008,7 +2920,6 @@ - @@ -3020,7 +2931,6 @@ - @@ -3032,7 +2942,6 @@ - @@ -3045,7 +2954,6 @@ - @@ -3058,7 +2966,6 @@ - @@ -3071,7 +2978,6 @@ - @@ -3100,7 +3006,6 @@ - @@ -3113,7 +3018,6 @@ - @@ -3125,7 +3029,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 60d141af1..8c11eeccc 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram @@ -5,46 +5,46 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -73,8 +73,8 @@ - - + + diff --git a/Software/Visual_Studio/Web/Tango.MachineService/App_Data/Tango.db b/Software/Visual_Studio/Web/Tango.MachineService/App_Data/Tango.db index 12c88039d..147c930c6 100644 Binary files a/Software/Visual_Studio/Web/Tango.MachineService/App_Data/Tango.db and b/Software/Visual_Studio/Web/Tango.MachineService/App_Data/Tango.db differ -- cgit v1.3.1 From d3ba251f01ae987a14b6379e733a06dbcd77f9e4 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Tue, 30 Jan 2018 18:21:37 +0200 Subject: Moved Observables to Integration !! Implemented basic sketch for IDS Pack Formulation. --- Software/DB/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/Tango_log.ldf | Bin 8388608 -> 8388608 bytes .../EventTypeActionsToStringConverter.cs | 2 +- .../Converters/LiquidTypeRmlsToStringConverter.cs | 2 +- .../RolesPermissionsToStringConverter.cs | 2 +- .../Converters/UsersRolesToStringConverter.cs | 2 +- .../Modules/Tango.MachineStudio.DB/DBModule.cs | 2 +- .../Messages/OpenEntityEditViewMessage.cs | 2 +- .../Tango.MachineStudio.DB.csproj | 8 +- .../ViewModels/ActionTypesViewVM.cs | 2 +- .../ViewModels/AddressesViewVM.cs | 2 +- .../ApplicationDisplayPanelVersionsViewVM.cs | 2 +- .../ApplicationFirmwareVersionsViewVM.cs | 2 +- .../ViewModels/ApplicationOsVersionsViewVM.cs | 2 +- .../ViewModels/ApplicationVersionsViewVM.cs | 2 +- .../ViewModels/CartridgeTypesViewVM.cs | 2 +- .../ViewModels/CatsViewVM.cs | 2 +- .../ViewModels/CctsViewVM.cs | 2 +- .../ViewModels/ConfigurationsViewVM.cs | 2 +- .../ViewModels/ContactsViewVM.cs | 2 +- .../ViewModels/DbTableViewModel.cs | 2 +- .../ViewModels/DispenserTypesViewVM.cs | 2 +- .../ViewModels/EmbeddedFirmwareVersionsViewVM.cs | 2 +- .../ViewModels/EmbeddedSoftwareVersionsViewVM.cs | 2 +- .../ViewModels/EventTypesViewVM.cs | 2 +- .../ViewModels/FiberShapesViewVM.cs | 2 +- .../ViewModels/FiberSynthsViewVM.cs | 2 +- .../ViewModels/HardwareVersionsViewVM.cs | 2 +- .../ViewModels/IdsPackFormulasViewVM.cs | 2 +- .../ViewModels/IdsPacksViewVM.cs | 2 +- .../ViewModels/LinearMassDensityUnitsViewVM.cs | 2 +- .../ViewModels/LiquidTypesRmlsViewVM.cs | 2 +- .../ViewModels/LiquidTypesViewVM.cs | 2 +- .../ViewModels/MachineVersionsViewVM.cs | 2 +- .../ViewModels/MachinesViewVM.cs | 2 +- .../ViewModels/MainViewVM.cs | 2 +- .../ViewModels/MediaColorsViewVM.cs | 2 +- .../ViewModels/MediaConditionsViewVM.cs | 2 +- .../ViewModels/MediaMaterialsViewVM.cs | 2 +- .../ViewModels/MediaPurposesViewVM.cs | 2 +- .../ViewModels/MidTankTypesViewVM.cs | 2 +- .../ViewModels/OrganizationsViewVM.cs | 2 +- .../ViewModels/PermissionsViewVM.cs | 2 +- .../ProcessParametersTablesGroupsViewVM.cs | 2 +- .../ViewModels/ProcessParametersTablesViewVM.cs | 2 +- .../ViewModels/RmlsViewVM.cs | 2 +- .../ViewModels/RolesViewVM.cs | 2 +- .../ViewModels/UsersViewVM.cs | 2 +- .../Converters/BrushStopCMYKToColorConverter.cs | 2 +- .../Converters/BrushStopLabToColorConverter.cs | 2 +- .../Converters/BrushStopToColorConverter.cs | 2 +- .../Converters/BrushStopToOffsetLimitConverter.cs | 2 +- .../Converters/DbRmlViewToEntityConverter.cs | 2 +- .../Converters/InkVolumeToLiquidRmlFactor.cs | 34 + .../Converters/SegmentToGradientStopsConverter.cs | 2 +- .../DeveloperModule.cs | 2 +- .../Tango.MachineStudio.Developer.csproj | 9 +- .../ViewModels/DBViewContextWrapper.cs | 2 +- .../ViewModels/MainViewVM.cs | 14 +- .../Views/MainView.xaml | 803 ++++---- .../Views/MainView.xaml.cs | 2 +- .../AutoComplete/MachineVersionsProvider.cs | 2 +- .../AutoComplete/MachinesProvider.cs | 2 +- .../MachineDesignerModule.cs | 2 +- .../Tango.MachineStudio.MachineDesigner.csproj | 8 +- .../ViewModels/MachineVersionDialogVM.cs | 2 +- .../ViewModels/MainViewVM.cs | 2 +- .../Views/MainView.xaml.cs | 2 +- .../Tango.MachineStudio.Stubs/StubsModule.cs | 2 +- .../Tango.MachineStudio.Stubs.csproj | 4 - .../AutoComplete/MachinesProvider.cs | 2 +- .../SynchronizationModule.cs | 2 +- .../Tango.MachineStudio.Synchronization.csproj | 4 - .../ViewModels/DirectSynchronizationViewVM.cs | 2 +- .../ViewModels/RemoteSynchronizationViewVM.cs | 2 +- .../Tango.MachineStudio.Technician.csproj | 4 - .../TechnicianModule.cs | 2 +- .../Authentication/IAuthenticationProvider.cs | 2 +- .../Tango.MachineStudio.Common/IStudioModule.cs | 2 +- .../Tango.MachineStudio.Common.csproj | 4 - .../Tango.MachineStudio.UI/App.xaml.cs | 2 +- .../DefaultAuthenticationProvider.cs | 2 +- .../Modules/DefaultStudioModuleLoader.cs | 3 +- .../Tango.MachineStudio.UI.csproj | 4 - .../ViewModels/LoadingViewVM.cs | 2 +- .../Templates/EntityCodeFile.cshtml | 4 +- .../Templates/EnumerationFile.cshtml | 2 +- .../Templates/ObservablesAdapterFile.cshtml | 2 +- .../Templates/ObservablesContextCodeFile.cshtml | 2 +- .../ExtensionMethods/ObjectExtensions.cs | 2 +- .../Visual_Studio/Tango.DAL.Observables/App.config | 13 - .../Tango.DAL.Observables/Entities/ActionType.cs | 104 -- .../Tango.DAL.Observables/Entities/Address.cs | 225 --- .../Entities/ApplicationDisplayPanelVersion.cs | 84 - .../Entities/ApplicationFirmwareVersion.cs | 84 - .../Entities/ApplicationOsVersion.cs | 84 - .../Entities/ApplicationVersion.cs | 84 - .../Tango.DAL.Observables/Entities/BrushStop.cs | 519 ------ .../Entities/CartridgeType.cs | 84 - .../Tango.DAL.Observables/Entities/Cat.cs | 140 -- .../Tango.DAL.Observables/Entities/Cct.cs | 201 -- .../Tango.DAL.Observables/Entities/ColorSpace.cs | 104 -- .../Entities/Configuration.cs | 420 ----- .../Tango.DAL.Observables/Entities/Contact.cs | 205 --- .../Entities/DispenserType.cs | 124 -- .../Entities/EmbeddedFirmwareVersion.cs | 84 - .../Entities/EmbeddedSoftwareVersion.cs | 84 - .../Tango.DAL.Observables/Entities/EventType.cs | 125 -- .../Entities/EventTypesAction.cs | 100 - .../Tango.DAL.Observables/Entities/FiberShape.cs | 84 - .../Tango.DAL.Observables/Entities/FiberSynth.cs | 84 - .../Entities/HardwareVersion.cs | 84 - .../Tango.DAL.Observables/Entities/IdsPack.cs | 296 --- .../Entities/IdsPackFormula.cs | 124 -- .../Tango.DAL.Observables/Entities/Job.cs | 302 --- .../Tango.DAL.Observables/Entities/JobRun.cs | 121 -- .../Entities/LinearMassDensityUnit.cs | 84 - .../Tango.DAL.Observables/Entities/LiquidType.cs | 166 -- .../Entities/LiquidTypesRml.cs | 120 -- .../Tango.DAL.Observables/Entities/Machine.cs | 263 --- .../Entities/MachineVersion.cs | 123 -- .../Entities/MachinesConfiguration.cs | 100 - .../Entities/MachinesEvent.cs | 179 -- .../Tango.DAL.Observables/Entities/MediaColor.cs | 64 - .../Entities/MediaCondition.cs | 84 - .../Entities/MediaMaterial.cs | 84 - .../Tango.DAL.Observables/Entities/MediaPurpos.cs | 84 - .../Tango.DAL.Observables/Entities/MidTankType.cs | 104 -- .../Tango.DAL.Observables/Entities/Organization.cs | 163 -- .../Tango.DAL.Observables/Entities/Permission.cs | 104 -- .../Entities/ProcessParametersTable.cs | 401 ---- .../Entities/ProcessParametersTablesGroup.cs | 143 -- .../Tango.DAL.Observables/Entities/Rml.cs | 661 ------- .../Tango.DAL.Observables/Entities/Role.cs | 125 -- .../Entities/RolesPermission.cs | 100 - .../Tango.DAL.Observables/Entities/Segment.cs | 123 -- .../Tango.DAL.Observables/Entities/Sensor.cs | 202 --- .../Entities/SyncConfiguration.cs | 22 - .../Tango.DAL.Observables/Entities/User.cs | 242 --- .../Tango.DAL.Observables/Entities/UsersRole.cs | 120 -- .../Entities/WindingMethod.cs | 104 -- .../EntityFieldNameAttribute.cs | 29 - .../Enumerations/ActionTypes.cs | 25 - .../Tango.DAL.Observables/Enumerations/Actions.cs | 12 - .../Enumerations/CartridgeTypes.cs | 19 - .../Enumerations/ColorSpaces.cs | 43 - .../Enumerations/DispenserTypes.cs | 19 - .../Enumerations/EventTypes.cs | 25 - .../Tango.DAL.Observables/Enumerations/Events.cs | 12 - .../Enumerations/FiberShapes.cs | 19 - .../Enumerations/FiberSynthes.cs | 12 - .../Enumerations/FiberSynthesises.cs | 12 - .../Enumerations/FiberSynths.cs | 19 - .../Enumerations/IdsPackFormulas.cs | 19 - .../Enumerations/LinearMassDensityUnits.cs | 19 - .../Enumerations/LiquidTypes.cs | 55 - .../Tango.DAL.Observables/Enumerations/Liquids.cs | 25 - .../Enumerations/MediaConditions.cs | 19 - .../Enumerations/MediaMaterials.cs | 19 - .../Enumerations/MediaPurposes.cs | 19 - .../Enumerations/MidTankTypes.cs | 19 - .../Enumerations/Permissions.cs | 43 - .../Tango.DAL.Observables/Enumerations/Rmls.cs | 25 - .../Tango.DAL.Observables/Enumerations/Roles.cs | 43 - .../Tango.DAL.Observables/Enumerations/Sensors.cs | 181 -- .../Enumerations/WindingMethods.cs | 25 - .../Tango.DAL.Observables/ExtensionMethods.cs | 34 - .../ExtensionMethods/ConfigurationExtensions.cs | 37 - .../ExtensionMethods/ObservableEntityExtensions.cs | 27 - .../ProcessParametersTablesGroupExtensions.cs | 27 - .../Tango.DAL.Observables/IObservableEntity.cs | 79 - .../Tango.DAL.Observables/LoadedEntitiesService.cs | 65 - .../Tango.DAL.Observables/ObservableEntity.cs | 254 --- .../Tango.DAL.Observables/ObservablesContext.cs | 451 ----- .../ObservablesEntitiesAdapter.cs | 300 --- .../ObservablesEntitiesAdapterExtension.cs | 1917 -------------------- .../Tango.DAL.Observables/Partials/BrushStop.cs | 156 -- .../Partials/Configuration.cs | 29 - .../Tango.DAL.Observables/Partials/Machine.cs | 27 - .../Partials/MachineVersion.cs | 19 - .../Tango.DAL.Observables/Partials/Segment.cs | 23 - .../Tango.DAL.Observables/Partials/User.cs | 39 - .../Properties/AssemblyInfo.cs | 6 - .../Tango.DAL.Observables.csproj | 185 -- .../Tango.DAL.Observables/packages.config | 47 - .../Formulation/DiluterFormulaCalculator.cs | 38 + .../Formulation/FormulaAttribute.cs | 19 + .../Formulation/FormulaResolver.cs | 36 + .../Formulation/FormulasCalculationService.cs | 30 + .../Formulation/IFormulaCalculator.cs | 13 + .../Formulation/StandardColorFormulaCalculator.cs | 38 + .../Observables/Entities/ActionType.cs | 104 ++ .../Observables/Entities/Address.cs | 225 +++ .../Entities/ApplicationDisplayPanelVersion.cs | 84 + .../Entities/ApplicationFirmwareVersion.cs | 84 + .../Observables/Entities/ApplicationOsVersion.cs | 84 + .../Observables/Entities/ApplicationVersion.cs | 84 + .../Observables/Entities/BrushStop.cs | 519 ++++++ .../Observables/Entities/CartridgeType.cs | 84 + .../Tango.Integration/Observables/Entities/Cat.cs | 140 ++ .../Tango.Integration/Observables/Entities/Cct.cs | 201 ++ .../Observables/Entities/ColorSpace.cs | 104 ++ .../Observables/Entities/Configuration.cs | 420 +++++ .../Observables/Entities/Contact.cs | 205 +++ .../Observables/Entities/DispenserType.cs | 124 ++ .../Entities/EmbeddedFirmwareVersion.cs | 84 + .../Entities/EmbeddedSoftwareVersion.cs | 84 + .../Observables/Entities/EventType.cs | 125 ++ .../Observables/Entities/EventTypesAction.cs | 100 + .../Observables/Entities/FiberShape.cs | 84 + .../Observables/Entities/FiberSynth.cs | 84 + .../Observables/Entities/HardwareVersion.cs | 84 + .../Observables/Entities/IdsPack.cs | 296 +++ .../Observables/Entities/IdsPackFormula.cs | 124 ++ .../Tango.Integration/Observables/Entities/Job.cs | 302 +++ .../Observables/Entities/JobRun.cs | 121 ++ .../Observables/Entities/LinearMassDensityUnit.cs | 84 + .../Observables/Entities/LiquidType.cs | 166 ++ .../Observables/Entities/LiquidTypesRml.cs | 120 ++ .../Observables/Entities/Machine.cs | 263 +++ .../Observables/Entities/MachineVersion.cs | 123 ++ .../Observables/Entities/MachinesConfiguration.cs | 100 + .../Observables/Entities/MachinesEvent.cs | 179 ++ .../Observables/Entities/MediaColor.cs | 64 + .../Observables/Entities/MediaCondition.cs | 84 + .../Observables/Entities/MediaMaterial.cs | 84 + .../Observables/Entities/MediaPurpos.cs | 84 + .../Observables/Entities/MidTankType.cs | 104 ++ .../Observables/Entities/Organization.cs | 163 ++ .../Observables/Entities/Permission.cs | 104 ++ .../Observables/Entities/ProcessParametersTable.cs | 401 ++++ .../Entities/ProcessParametersTablesGroup.cs | 143 ++ .../Tango.Integration/Observables/Entities/Rml.cs | 661 +++++++ .../Tango.Integration/Observables/Entities/Role.cs | 125 ++ .../Observables/Entities/RolesPermission.cs | 100 + .../Observables/Entities/Segment.cs | 123 ++ .../Observables/Entities/Sensor.cs | 202 +++ .../Observables/Entities/SyncConfiguration.cs | 22 + .../Tango.Integration/Observables/Entities/User.cs | 242 +++ .../Observables/Entities/UsersRole.cs | 120 ++ .../Observables/Entities/WindingMethod.cs | 104 ++ .../Observables/EntityFieldNameAttribute.cs | 29 + .../Observables/Enumerations/ActionTypes.cs | 25 + .../Observables/Enumerations/Actions.cs | 12 + .../Observables/Enumerations/CartridgeTypes.cs | 19 + .../Observables/Enumerations/ColorSpaces.cs | 43 + .../Observables/Enumerations/DispenserTypes.cs | 19 + .../Observables/Enumerations/EventTypes.cs | 25 + .../Observables/Enumerations/Events.cs | 12 + .../Observables/Enumerations/FiberShapes.cs | 19 + .../Observables/Enumerations/FiberSynthes.cs | 12 + .../Observables/Enumerations/FiberSynthesises.cs | 12 + .../Observables/Enumerations/FiberSynths.cs | 19 + .../Observables/Enumerations/IdsPackFormulas.cs | 24 + .../Enumerations/LinearMassDensityUnits.cs | 19 + .../Observables/Enumerations/LiquidTypes.cs | 55 + .../Observables/Enumerations/Liquids.cs | 25 + .../Observables/Enumerations/MediaConditions.cs | 19 + .../Observables/Enumerations/MediaMaterials.cs | 19 + .../Observables/Enumerations/MediaPurposes.cs | 19 + .../Observables/Enumerations/MidTankTypes.cs | 19 + .../Observables/Enumerations/Permissions.cs | 43 + .../Observables/Enumerations/Rmls.cs | 25 + .../Observables/Enumerations/Roles.cs | 43 + .../Observables/Enumerations/Sensors.cs | 181 ++ .../Observables/Enumerations/WindingMethods.cs | 25 + .../ExtensionMethods/ConfigurationExtensions.cs | 37 + .../ExtensionMethods/ObservableEntityExtensions.cs | 27 + .../ProcessParametersTablesGroupExtensions.cs | 27 + .../Observables/IObservableEntity.cs | 79 + .../Observables/ObservableEntity.cs | 253 +++ .../Observables/ObservablesContext.cs | 451 +++++ .../Observables/ObservablesEntitiesAdapter.cs | 298 +++ .../ObservablesEntitiesAdapterExtension.cs | 1917 ++++++++++++++++++++ .../Observables/Partials/Configuration.cs | 29 + .../Observables/Partials/Machine.cs | 27 + .../Observables/Partials/MachineVersion.cs | 19 + .../Observables/Partials/Segment.cs | 23 + .../Tango.Integration/Observables/Partials/User.cs | 39 + .../Tango.Integration/Printing/BrushStop.cs | 105 ++ .../Tango.Integration/Printing/LiquidVolume.cs | 123 ++ .../Tango.Integration/Printing/Profile.cs | 22 - .../Tango.Integration/Printing/Segment.cs | 14 - .../Services/ExternalBridgeTcpClient.cs | 2 +- .../Services/ExternalBridgeUsbClient.cs | 2 +- .../Tango.Integration/Tango.Integration.csproj | 112 +- .../Visual_Studio/Tango.Integration/app.config | 10 + .../Tango.Integration/packages.config | 1 + .../Tango.UnitTesting/CodeGeneration_TST.cs | 2 +- .../Tango.UnitTesting/Tango.UnitTesting.csproj | 8 +- Software/Visual_Studio/Tango.sln | 31 - 291 files changed, 13053 insertions(+), 12916 deletions(-) create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/InkVolumeToLiquidRmlFactor.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/App.config delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/ActionType.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/Address.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/ApplicationDisplayPanelVersion.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/ApplicationFirmwareVersion.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/ApplicationOsVersion.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/ApplicationVersion.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/BrushStop.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/CartridgeType.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/Cat.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/Cct.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/ColorSpace.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/Configuration.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/Contact.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/DispenserType.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/EmbeddedFirmwareVersion.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/EmbeddedSoftwareVersion.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/EventType.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/EventTypesAction.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/FiberShape.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/FiberSynth.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/HardwareVersion.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/IdsPack.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/IdsPackFormula.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/Job.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/JobRun.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/LinearMassDensityUnit.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/LiquidType.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/LiquidTypesRml.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/Machine.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/MachineVersion.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/MachinesConfiguration.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/MachinesEvent.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/MediaColor.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/MediaCondition.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/MediaMaterial.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/MediaPurpos.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/MidTankType.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/Organization.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/Permission.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/ProcessParametersTable.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/ProcessParametersTablesGroup.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/Rml.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/Role.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/RolesPermission.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/Segment.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/Sensor.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/SyncConfiguration.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/User.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/UsersRole.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/WindingMethod.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/EntityFieldNameAttribute.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Enumerations/ActionTypes.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Enumerations/Actions.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Enumerations/CartridgeTypes.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Enumerations/ColorSpaces.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Enumerations/DispenserTypes.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Enumerations/EventTypes.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Enumerations/Events.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Enumerations/FiberShapes.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Enumerations/FiberSynthes.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Enumerations/FiberSynthesises.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Enumerations/FiberSynths.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Enumerations/IdsPackFormulas.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Enumerations/LinearMassDensityUnits.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Enumerations/LiquidTypes.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Enumerations/Liquids.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Enumerations/MediaConditions.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Enumerations/MediaMaterials.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Enumerations/MediaPurposes.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Enumerations/MidTankTypes.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Enumerations/Permissions.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Enumerations/Rmls.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Enumerations/Roles.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Enumerations/Sensors.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Enumerations/WindingMethods.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/ExtensionMethods.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/ExtensionMethods/ConfigurationExtensions.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/ExtensionMethods/ObservableEntityExtensions.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/ExtensionMethods/ProcessParametersTablesGroupExtensions.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/IObservableEntity.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/LoadedEntitiesService.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/ObservableEntity.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/ObservablesContext.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapter.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapterExtension.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Partials/BrushStop.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Partials/Configuration.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Partials/Machine.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Partials/MachineVersion.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Partials/Segment.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Partials/User.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Properties/AssemblyInfo.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Tango.DAL.Observables.csproj delete mode 100644 Software/Visual_Studio/Tango.DAL.Observables/packages.config create mode 100644 Software/Visual_Studio/Tango.Integration/Formulation/DiluterFormulaCalculator.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Formulation/FormulaAttribute.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Formulation/FormulaResolver.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Formulation/FormulasCalculationService.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Formulation/IFormulaCalculator.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Formulation/StandardColorFormulaCalculator.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/ActionType.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/Address.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/ApplicationDisplayPanelVersion.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/ApplicationFirmwareVersion.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/ApplicationOsVersion.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/ApplicationVersion.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/BrushStop.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/CartridgeType.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/Cat.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/Cct.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/ColorSpace.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/Configuration.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/Contact.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/DispenserType.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/EmbeddedFirmwareVersion.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/EmbeddedSoftwareVersion.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/EventType.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/EventTypesAction.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/FiberShape.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/FiberSynth.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/HardwareVersion.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/IdsPack.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/IdsPackFormula.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/Job.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/JobRun.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/LinearMassDensityUnit.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/LiquidType.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/LiquidTypesRml.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/Machine.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/MachineVersion.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/MachinesConfiguration.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/MachinesEvent.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/MediaColor.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/MediaCondition.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/MediaMaterial.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/MediaPurpos.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/MidTankType.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/Organization.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/Permission.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/ProcessParametersTable.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/ProcessParametersTablesGroup.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/Rml.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/Role.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/RolesPermission.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/Segment.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/Sensor.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/SyncConfiguration.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/User.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/UsersRole.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Entities/WindingMethod.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/EntityFieldNameAttribute.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Enumerations/ActionTypes.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Enumerations/Actions.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Enumerations/CartridgeTypes.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Enumerations/ColorSpaces.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Enumerations/DispenserTypes.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Enumerations/EventTypes.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Enumerations/Events.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Enumerations/FiberShapes.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Enumerations/FiberSynthes.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Enumerations/FiberSynthesises.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Enumerations/FiberSynths.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Enumerations/IdsPackFormulas.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Enumerations/LinearMassDensityUnits.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Enumerations/LiquidTypes.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Enumerations/Liquids.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Enumerations/MediaConditions.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Enumerations/MediaMaterials.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Enumerations/MediaPurposes.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Enumerations/MidTankTypes.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Enumerations/Permissions.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Enumerations/Rmls.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Enumerations/Roles.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Enumerations/Sensors.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Enumerations/WindingMethods.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/ExtensionMethods/ConfigurationExtensions.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/ExtensionMethods/ObservableEntityExtensions.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/ExtensionMethods/ProcessParametersTablesGroupExtensions.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/IObservableEntity.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/ObservableEntity.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/ObservablesContext.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/ObservablesEntitiesAdapter.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/ObservablesEntitiesAdapterExtension.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Partials/Configuration.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Partials/Machine.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Partials/MachineVersion.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Partials/Segment.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Observables/Partials/User.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Printing/BrushStop.cs create mode 100644 Software/Visual_Studio/Tango.Integration/Printing/LiquidVolume.cs delete mode 100644 Software/Visual_Studio/Tango.Integration/Printing/Profile.cs delete mode 100644 Software/Visual_Studio/Tango.Integration/Printing/Segment.cs (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/AutoComplete') diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf index c18c24b9b..bcc1f689e 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 dec616894..ee1c0e679 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/Tango.MachineStudio.DB/Converters/EventTypeActionsToStringConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/EventTypeActionsToStringConverter.cs index 3f0654247..c50493c3d 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/EventTypeActionsToStringConverter.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/EventTypeActionsToStringConverter.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Data; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.DB.ViewModels; namespace Tango.MachineStudio.DB.Converters diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/LiquidTypeRmlsToStringConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/LiquidTypeRmlsToStringConverter.cs index a8e82b69b..b9b0b6656 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/LiquidTypeRmlsToStringConverter.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/LiquidTypeRmlsToStringConverter.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Data; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.DB.ViewModels; namespace Tango.MachineStudio.DB.Converters diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/RolesPermissionsToStringConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/RolesPermissionsToStringConverter.cs index 96c4d7d7d..fb7c39fd9 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/RolesPermissionsToStringConverter.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/RolesPermissionsToStringConverter.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Data; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.DB.ViewModels; namespace Tango.MachineStudio.DB.Converters diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/UsersRolesToStringConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/UsersRolesToStringConverter.cs index 6b2712642..f6aaeede1 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/UsersRolesToStringConverter.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/UsersRolesToStringConverter.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Data; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.DB.ViewModels; namespace Tango.MachineStudio.DB.Converters diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/DBModule.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/DBModule.cs index c433a4cd4..82cd716b3 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/DBModule.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/DBModule.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows; using System.Windows.Media.Imaging; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common; using Tango.MachineStudio.DB.Views; diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Messages/OpenEntityEditViewMessage.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Messages/OpenEntityEditViewMessage.cs index b0c099f1a..7a55c8148 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Messages/OpenEntityEditViewMessage.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Messages/OpenEntityEditViewMessage.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Messages; using Tango.MachineStudio.DB.ViewModels; using Tango.SharedUI; 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 c17c43aa0..aa33f9a20 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 @@ -712,14 +712,14 @@ {a34ee0f0-649d-41c8-8489-b6f1cc6924ee} Tango.Core - - {0ecd6da8-7aa6-48d9-8b65-279d176ad9af} - Tango.DAL.Observables - {38197109-8610-4d3f-92b9-16d48df94d7c} Tango.DAL.Remote + + {4206ac58-3b57-4699-8835-90bf6db01a61} + Tango.Integration + {8491d07b-c1f6-4b62-a412-41b9fd2d6538} Tango.SharedUI 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 index fe9ebda26..46128c394 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ActionTypesViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ActionTypesViewVM.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; namespace Tango.MachineStudio.DB.ViewModels diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/AddressesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/AddressesViewVM.cs index 41eab1c37..8fc5c0c07 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/AddressesViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/AddressesViewVM.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; namespace Tango.MachineStudio.DB.ViewModels diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ApplicationDisplayPanelVersionsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ApplicationDisplayPanelVersionsViewVM.cs index be458136a..e2b345d59 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ApplicationDisplayPanelVersionsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ApplicationDisplayPanelVersionsViewVM.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; namespace Tango.MachineStudio.DB.ViewModels diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ApplicationFirmwareVersionsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ApplicationFirmwareVersionsViewVM.cs index 0814988ba..dcc980f33 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ApplicationFirmwareVersionsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ApplicationFirmwareVersionsViewVM.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; namespace Tango.MachineStudio.DB.ViewModels diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ApplicationOsVersionsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ApplicationOsVersionsViewVM.cs index 3cdd8acb7..f90f51d65 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ApplicationOsVersionsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ApplicationOsVersionsViewVM.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; namespace Tango.MachineStudio.DB.ViewModels diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ApplicationVersionsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ApplicationVersionsViewVM.cs index 6e25fe321..fbd1f6166 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ApplicationVersionsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ApplicationVersionsViewVM.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; namespace Tango.MachineStudio.DB.ViewModels diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CartridgeTypesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CartridgeTypesViewVM.cs index c8c6ba00b..d04b013d9 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CartridgeTypesViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CartridgeTypesViewVM.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; namespace Tango.MachineStudio.DB.ViewModels diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CatsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CatsViewVM.cs index a768b3c7c..67988c73b 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CatsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CatsViewVM.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Tango.Core.Commands; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; namespace Tango.MachineStudio.DB.ViewModels diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CctsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CctsViewVM.cs index 02d7c351d..ebd360d76 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CctsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CctsViewVM.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Tango.Core.Commands; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; namespace 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 bdec4f91b..09010ec93 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 @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; namespace Tango.MachineStudio.DB.ViewModels diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ContactsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ContactsViewVM.cs index 848cb1187..fdd31b847 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ContactsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ContactsViewVM.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; using SimpleValidator.Extensions; diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs index e1be2aa9b..d6de58de4 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Tango.Core.Commands; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; using Tango.MachineStudio.DB.Managers; using Tango.SharedUI; diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DispenserTypesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DispenserTypesViewVM.cs index 97adfa7d4..26167490f 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DispenserTypesViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DispenserTypesViewVM.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; namespace Tango.MachineStudio.DB.ViewModels diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EmbeddedFirmwareVersionsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EmbeddedFirmwareVersionsViewVM.cs index a248d919a..e41ea34f1 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EmbeddedFirmwareVersionsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EmbeddedFirmwareVersionsViewVM.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; namespace Tango.MachineStudio.DB.ViewModels diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EmbeddedSoftwareVersionsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EmbeddedSoftwareVersionsViewVM.cs index b6436203d..d06b81221 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EmbeddedSoftwareVersionsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EmbeddedSoftwareVersionsViewVM.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; namespace Tango.MachineStudio.DB.ViewModels 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 index 687c30470..f4b2af4d4 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesViewVM.cs @@ -4,7 +4,7 @@ using System.Collections.ObjectModel; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; namespace Tango.MachineStudio.DB.ViewModels diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/FiberShapesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/FiberShapesViewVM.cs index c4954f9b3..42c0d428d 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/FiberShapesViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/FiberShapesViewVM.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; namespace Tango.MachineStudio.DB.ViewModels diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/FiberSynthsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/FiberSynthsViewVM.cs index 6b157fc0d..739c23e55 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/FiberSynthsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/FiberSynthsViewVM.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; namespace Tango.MachineStudio.DB.ViewModels diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/HardwareVersionsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/HardwareVersionsViewVM.cs index 02c90c442..db30ad4cf 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/HardwareVersionsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/HardwareVersionsViewVM.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; namespace Tango.MachineStudio.DB.ViewModels diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/IdsPackFormulasViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/IdsPackFormulasViewVM.cs index a2763a257..391c17d70 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/IdsPackFormulasViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/IdsPackFormulasViewVM.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; namespace Tango.MachineStudio.DB.ViewModels diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/IdsPacksViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/IdsPacksViewVM.cs index 202dd959f..2accac011 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/IdsPacksViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/IdsPacksViewVM.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; namespace Tango.MachineStudio.DB.ViewModels diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LinearMassDensityUnitsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LinearMassDensityUnitsViewVM.cs index 9ac38a7c4..9c3880293 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LinearMassDensityUnitsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LinearMassDensityUnitsViewVM.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; namespace Tango.MachineStudio.DB.ViewModels diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LiquidTypesRmlsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LiquidTypesRmlsViewVM.cs index 5b8e3749f..6159e1297 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LiquidTypesRmlsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LiquidTypesRmlsViewVM.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; namespace Tango.MachineStudio.DB.ViewModels diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LiquidTypesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LiquidTypesViewVM.cs index 05171b09f..b16b95ee4 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LiquidTypesViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LiquidTypesViewVM.cs @@ -4,7 +4,7 @@ using System.Collections.ObjectModel; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; namespace Tango.MachineStudio.DB.ViewModels diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MachineVersionsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MachineVersionsViewVM.cs index 6a24f7d4c..7eec73dc1 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MachineVersionsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MachineVersionsViewVM.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; namespace Tango.MachineStudio.DB.ViewModels diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MachinesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MachinesViewVM.cs index 2349941fe..0f3ab8b04 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MachinesViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MachinesViewVM.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Tango.Core.Commands; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; using Tango.SharedUI; diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MainViewVM.cs index 7e472ee75..2835ef102 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MainViewVM.cs @@ -6,7 +6,7 @@ using System.Reflection; using System.Text; using System.Threading.Tasks; using System.Windows; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common; using Tango.MachineStudio.Common.StudioApplication; using Tango.SharedUI; 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 index 4227cc27a..bc0736a43 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaColorsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaColorsViewVM.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; namespace Tango.MachineStudio.DB.ViewModels diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaConditionsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaConditionsViewVM.cs index 451e20ff0..167482bc8 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaConditionsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaConditionsViewVM.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; namespace Tango.MachineStudio.DB.ViewModels diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaMaterialsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaMaterialsViewVM.cs index 534ebc0d8..9161ef3e9 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaMaterialsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaMaterialsViewVM.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; namespace Tango.MachineStudio.DB.ViewModels diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaPurposesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaPurposesViewVM.cs index 4850f6316..6e6b74a32 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaPurposesViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaPurposesViewVM.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; namespace Tango.MachineStudio.DB.ViewModels diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MidTankTypesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MidTankTypesViewVM.cs index 6203a8fe3..c9a82363e 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MidTankTypesViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MidTankTypesViewVM.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; namespace Tango.MachineStudio.DB.ViewModels diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/OrganizationsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/OrganizationsViewVM.cs index 0327557f1..d35a00a80 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/OrganizationsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/OrganizationsViewVM.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; namespace Tango.MachineStudio.DB.ViewModels diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/PermissionsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/PermissionsViewVM.cs index 9a2d1c24d..6dbab596e 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/PermissionsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/PermissionsViewVM.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; namespace Tango.MachineStudio.DB.ViewModels diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ProcessParametersTablesGroupsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ProcessParametersTablesGroupsViewVM.cs index 620762a6f..87fdecec8 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ProcessParametersTablesGroupsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ProcessParametersTablesGroupsViewVM.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; namespace Tango.MachineStudio.DB.ViewModels diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ProcessParametersTablesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ProcessParametersTablesViewVM.cs index 965b0e391..0716430ab 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ProcessParametersTablesViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ProcessParametersTablesViewVM.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; namespace Tango.MachineStudio.DB.ViewModels diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/RmlsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/RmlsViewVM.cs index 740a4969b..7145b9201 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/RmlsViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/RmlsViewVM.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; namespace Tango.MachineStudio.DB.ViewModels diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/RolesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/RolesViewVM.cs index 50caf4c6d..049b4b6db 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/RolesViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/RolesViewVM.cs @@ -4,7 +4,7 @@ using System.Collections.ObjectModel; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; using Tango.MachineStudio.DB.ViewModels; diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/UsersViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/UsersViewVM.cs index e338746ff..3a09b27e6 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/UsersViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/UsersViewVM.cs @@ -4,7 +4,7 @@ using System.Collections.ObjectModel; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; using SimpleValidator.Extensions; diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/BrushStopCMYKToColorConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/BrushStopCMYKToColorConverter.cs index e21da8fbc..5bc163b18 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/BrushStopCMYKToColorConverter.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/BrushStopCMYKToColorConverter.cs @@ -7,7 +7,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Data; using System.Windows.Media; -using Tango.DAL.Observables; +using Tango.Integration.Observables; namespace Tango.MachineStudio.Developer.Converters { diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/BrushStopLabToColorConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/BrushStopLabToColorConverter.cs index 6c6d7959e..f3dc07d3e 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/BrushStopLabToColorConverter.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/BrushStopLabToColorConverter.cs @@ -7,7 +7,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Data; using System.Windows.Media; -using Tango.DAL.Observables; +using Tango.Integration.Observables; namespace Tango.MachineStudio.Developer.Converters { diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/BrushStopToColorConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/BrushStopToColorConverter.cs index 5db8d03c0..33cd8cc78 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/BrushStopToColorConverter.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/BrushStopToColorConverter.cs @@ -6,7 +6,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Data; using System.Windows.Media; -using Tango.DAL.Observables; +using Tango.Integration.Observables; namespace Tango.MachineStudio.Developer.Converters { diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/BrushStopToOffsetLimitConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/BrushStopToOffsetLimitConverter.cs index c18a5679b..53efd50b8 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/BrushStopToOffsetLimitConverter.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/BrushStopToOffsetLimitConverter.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Data; -using Tango.DAL.Observables; +using Tango.Integration.Observables; namespace Tango.MachineStudio.Developer.Converters { diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/DbRmlViewToEntityConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/DbRmlViewToEntityConverter.cs index a2f0023cc..1fe3e5ab0 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/DbRmlViewToEntityConverter.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/DbRmlViewToEntityConverter.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Data; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Developer.ViewModels; namespace Tango.MachineStudio.Developer.Converters diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/InkVolumeToLiquidRmlFactor.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/InkVolumeToLiquidRmlFactor.cs new file mode 100644 index 000000000..3b675d23e --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/InkVolumeToLiquidRmlFactor.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Data; +using Tango.Integration.Observables; +using static Tango.Integration.Observables.BrushStop; + +namespace Tango.MachineStudio.Developer.Converters +{ + //public class InkVolumeToLiquidRmlFactor : IMultiValueConverter + //{ + // public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture) + // { + // InkVolume inkVolume = values[0] as InkVolume; + // Rml selectedRml = values[1] as Rml; + + // if (inkVolume != null && selectedRml != null) + // { + // return inkVolume.GetLiquidMaxNanoliterPerCentimeter().ToString(); + // } + + // return String.Empty; + // } + + // public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture) + // { + // throw new NotImplementedException(); + // } + //} +} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/SegmentToGradientStopsConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/SegmentToGradientStopsConverter.cs index 1588b7740..37908c940 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/SegmentToGradientStopsConverter.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/SegmentToGradientStopsConverter.cs @@ -6,7 +6,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Data; using System.Windows.Media; -using Tango.DAL.Observables; +using Tango.Integration.Observables; namespace Tango.MachineStudio.Developer.Converters { diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModule.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModule.cs index 4401245a9..1a405f861 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModule.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModule.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows; using System.Windows.Media.Imaging; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common; using Tango.MachineStudio.Developer.Views; using Tango.SharedUI.Helpers; diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj index 5bae48c1a..1865ff11a 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj @@ -76,6 +76,7 @@ + @@ -138,10 +139,6 @@ {a34ee0f0-649d-41c8-8489-b6f1cc6924ee} Tango.Core - - {0ecd6da8-7aa6-48d9-8b65-279d176ad9af} - Tango.DAL.Observables - {38197109-8610-4d3f-92b9-16d48df94d7c} Tango.DAL.Remote @@ -150,6 +147,10 @@ {b112d89a-a106-41ae-a0c1-4abc84c477f5} Tango.DragAndDrop + + {4206ac58-3b57-4699-8835-90bf6db01a61} + Tango.Integration + {8491d07b-c1f6-4b62-a412-41b9fd2d6538} Tango.SharedUI diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/DBViewContextWrapper.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/DBViewContextWrapper.cs index 231c27bf2..21611a493 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/DBViewContextWrapper.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/DBViewContextWrapper.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; namespace Tango.MachineStudio.Developer.ViewModels { 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 5a1b46041..f6ddc9d19 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 @@ -9,7 +9,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Media; using Tango.Core.Commands; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Controls; using Tango.MachineStudio.Common.Notifications; using Tango.MachineStudio.Common.StudioApplication; @@ -47,8 +47,8 @@ namespace Tango.MachineStudio.Developer.ViewModels set { _selectedMachine = value; - RaisePropertyChangedAuto(); OnMachineChanged(); + RaisePropertyChangedAuto(); InvalidateRelayCommands(); if (_selectedMachine != null) @@ -145,8 +145,8 @@ namespace Tango.MachineStudio.Developer.ViewModels set { _selectedRML = value; - RaisePropertyChangedAuto(); InvalidateLiquidFactorsAndProcessTables(); + RaisePropertyChangedAuto(); InvalidateRelayCommands(); } } @@ -308,7 +308,7 @@ namespace Tango.MachineStudio.Developer.ViewModels { if (SelectedSegment != null) { - SetSegmentBrushStopsInkVolumes(SelectedSegment); + SetSegmentBrushStopsLiquidVolumes(SelectedSegment); SelectedBrushStop = SelectedSegment.BrushStops.FirstOrDefault(); } } @@ -347,13 +347,13 @@ namespace Tango.MachineStudio.Developer.ViewModels #region Private Methods - private void SetSegmentBrushStopsInkVolumes(Segment segment) + private void SetSegmentBrushStopsLiquidVolumes(Segment segment) { if (!DesignMode) { foreach (var stop in segment.BrushStops) { - stop.SetInkVolumes(SelectedMachine.Configuration); + stop.SetLiquidVolumes(SelectedMachine.Configuration, SelectedRML); } } } @@ -526,7 +526,7 @@ namespace Tango.MachineStudio.Developer.ViewModels { var stop = new BrushStop(); stop.ColorSpace = Adapter.ColorSpaces.FirstOrDefault(); - stop.SetInkVolumes(SelectedMachine.Configuration); + stop.SetLiquidVolumes(SelectedMachine.Configuration, SelectedRML); SelectedSegment.BrushStops.Add(stop); } } diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml index 90842b672..6e4d69d05 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml @@ -14,7 +14,7 @@ xmlns:vm="clr-namespace:Tango.MachineStudio.Developer.ViewModels" xmlns:localConverters="clr-namespace:Tango.MachineStudio.Developer.Converters" xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI" - xmlns:observables="clr-namespace:Tango.DAL.Observables;assembly=Tango.DAL.Observables" + xmlns:observables="clr-namespace:Tango.Integration.Observables;assembly=Tango.Integration" xmlns:editors="clr-namespace:Tango.SharedUI.Editors;assembly=Tango.SharedUI" xmlns:shapes="clr-namespace:Tango.SharedUI.Shapes;assembly=Tango.SharedUI" xmlns:local="clr-namespace:Tango.MachineStudio.Developer.Views" @@ -344,8 +344,8 @@ - - + + @@ -360,14 +360,16 @@ - - - - + + + + + + @@ -458,336 +460,511 @@ - - - - Description - + + + + + Description + - - - - + + + + + - - - - + + + + + + + + + - - - - SEGMENTS - + + + + SEGMENTS + - - - - + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - Name - - - - - - + + + + - - Length + + + + + Name + + + + + + + + + Length + + + + - + + + + + + + + + + + + + - - - - - - - - - - - - - - SEGMENT BRUSH - + + + + + + SEGMENT BRUSH + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Color Space + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - Color Space - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + ESTIMATED DURATION: + 00:00:00 + + + + + + + + + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml.cs index 52febe37b..c9796fbe2 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml.cs @@ -12,7 +12,7 @@ using System.Windows.Media; using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.DragAndDrop; using Tango.MachineStudio.Developer.Converters; using Tango.MachineStudio.Developer.ViewModels; diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/AutoComplete/MachineVersionsProvider.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/AutoComplete/MachineVersionsProvider.cs index 51ca629a4..c018e3ce8 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/AutoComplete/MachineVersionsProvider.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/AutoComplete/MachineVersionsProvider.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Tango.AutoComplete.Editors; -using Tango.DAL.Observables; +using Tango.Integration.Observables; namespace Tango.MachineStudio.MachineDesigner.AutoComplete { diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/AutoComplete/MachinesProvider.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/AutoComplete/MachinesProvider.cs index 7a97db2e2..9261f648a 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/AutoComplete/MachinesProvider.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/AutoComplete/MachinesProvider.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Tango.AutoComplete.Editors; -using Tango.DAL.Observables; +using Tango.Integration.Observables; namespace Tango.MachineStudio.MachineDesigner.AutoComplete { diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/MachineDesignerModule.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/MachineDesignerModule.cs index b0160abd5..f5b0cba98 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/MachineDesignerModule.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/MachineDesignerModule.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows; using System.Windows.Media.Imaging; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common; using Tango.MachineStudio.MachineDesigner.Views; using Tango.SharedUI.Helpers; diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj index bebcf2480..46571f99c 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj @@ -146,10 +146,6 @@ {a34ee0f0-649d-41c8-8489-b6f1cc6924ee} Tango.Core - - {0ecd6da8-7aa6-48d9-8b65-279d176ad9af} - Tango.DAL.Observables - {38197109-8610-4d3f-92b9-16d48df94d7c} Tango.DAL.Remote @@ -158,6 +154,10 @@ {b112d89a-a106-41ae-a0c1-4abc84c477f5} Tango.DragAndDrop + + {4206ac58-3b57-4699-8835-90bf6db01a61} + Tango.Integration + {bc932dbd-7cdb-488c-99e4-f02cf441f55e} Tango.Logging diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineVersionDialogVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineVersionDialogVM.cs index 3776a5e91..15bebefc8 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineVersionDialogVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineVersionDialogVM.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Tango.Core.Commands; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; using Tango.MachineStudio.MachineDesigner.AutoComplete; diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs index 9077826a5..cedbcf9a6 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; using System.Windows.Data; using Tango.Core.Commands; using Tango.Core.Helpers; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Notifications; using Tango.SharedUI; using SimpleValidator.Extensions; diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml.cs index 70e127b6c..528bb3457 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml.cs @@ -14,7 +14,7 @@ using System.Windows.Media.Animation; using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.DragAndDrop; using Tango.MachineStudio.MachineDesigner.ViewModels; diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/StubsModule.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/StubsModule.cs index 8b072ea46..359ac2977 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/StubsModule.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/StubsModule.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows; using System.Windows.Media.Imaging; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common; using Tango.MachineStudio.Stubs.Views; using Tango.SharedUI.Helpers; diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Tango.MachineStudio.Stubs.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Tango.MachineStudio.Stubs.csproj index 436a8b3ff..c9670d1be 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Tango.MachineStudio.Stubs.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Tango.MachineStudio.Stubs.csproj @@ -135,10 +135,6 @@ {a34ee0f0-649d-41c8-8489-b6f1cc6924ee} Tango.Core - - {0ecd6da8-7aa6-48d9-8b65-279d176ad9af} - Tango.DAL.Observables - {4206ac58-3b57-4699-8835-90bf6db01a61} Tango.Integration diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/AutoComplete/MachinesProvider.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/AutoComplete/MachinesProvider.cs index ef2d4fc68..e9d205bed 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/AutoComplete/MachinesProvider.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/AutoComplete/MachinesProvider.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Tango.AutoComplete.Editors; -using Tango.DAL.Observables; +using Tango.Integration.Observables; namespace Tango.MachineStudio.Synchronization.AutoComplete { diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/SynchronizationModule.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/SynchronizationModule.cs index 4a753b05e..bbf0f8ca1 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/SynchronizationModule.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/SynchronizationModule.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows; using System.Windows.Media.Imaging; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common; using Tango.MachineStudio.Synchronization.Views; using Tango.SharedUI.Helpers; diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Tango.MachineStudio.Synchronization.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Tango.MachineStudio.Synchronization.csproj index 3c03f1e48..2a95dc082 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Tango.MachineStudio.Synchronization.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Tango.MachineStudio.Synchronization.csproj @@ -193,10 +193,6 @@ {0e0eef3e-8f4e-4f23-9d19-479fd8d76c12} Tango.DAL.Local - - {0ecd6da8-7aa6-48d9-8b65-279d176ad9af} - Tango.DAL.Observables - {38197109-8610-4d3f-92b9-16d48df94d7c} Tango.DAL.Remote diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/DirectSynchronizationViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/DirectSynchronizationViewVM.cs index 9a6c921d4..d7dac7fbe 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/DirectSynchronizationViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/DirectSynchronizationViewVM.cs @@ -10,7 +10,7 @@ using System.Threading; using System.Threading.Tasks; using Tango.Core.Commands; using Tango.Core.Helpers; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.Integration.Services; using Tango.MachineStudio.Common.Notifications; using Tango.MachineStudio.Common.StudioApplication; diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/RemoteSynchronizationViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/RemoteSynchronizationViewVM.cs index 5ce0a9786..f9f738a26 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/RemoteSynchronizationViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/RemoteSynchronizationViewVM.cs @@ -10,7 +10,7 @@ using System.Threading; using System.Threading.Tasks; using Tango.Core.Commands; using Tango.DAL.Local.DB; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.DAL.Remote.DB; using Tango.Logging; using Tango.MachineStudio.Common.Notifications; diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj index 62da02f50..196589e99 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj @@ -156,10 +156,6 @@ {a34ee0f0-649d-41c8-8489-b6f1cc6924ee} Tango.Core - - {0ecd6da8-7aa6-48d9-8b65-279d176ad9af} - Tango.DAL.Observables - {4206ac58-3b57-4699-8835-90bf6db01a61} Tango.Integration diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechnicianModule.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechnicianModule.cs index 4d211acf1..6bdc4c7df 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechnicianModule.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechnicianModule.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows; using System.Windows.Media.Imaging; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common; using Tango.MachineStudio.Technician.Views; using Tango.SharedUI.Helpers; diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/IAuthenticationProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/IAuthenticationProvider.cs index e2d4072ba..590936163 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/IAuthenticationProvider.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Authentication/IAuthenticationProvider.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; namespace Tango.MachineStudio.Common.Authentication { diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/IStudioModule.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/IStudioModule.cs index 118afff7e..7718c0a7a 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/IStudioModule.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/IStudioModule.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows; using System.Windows.Media.Imaging; -using Tango.DAL.Observables; +using Tango.Integration.Observables; namespace Tango.MachineStudio.Common { diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj index bc7f00d58..cc8ac8ac3 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj @@ -158,10 +158,6 @@ {a34ee0f0-649d-41c8-8489-b6f1cc6924ee} Tango.Core - - {0ecd6da8-7aa6-48d9-8b65-279d176ad9af} - Tango.DAL.Observables - {38197109-8610-4d3f-92b9-16d48df94d7c} Tango.DAL.Remote diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs index ca553de1e..50e57aab1 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs @@ -5,7 +5,7 @@ using System.Data; using System.Linq; using System.Threading.Tasks; using System.Windows; -using Tango.DAL.Observables; +using Tango.Integration.Observables; namespace Tango.MachineStudio.UI { diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs index 80e5e9762..82aba268d 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Authentication/DefaultAuthenticationProvider.cs @@ -5,7 +5,7 @@ using System.Security.Authentication; using System.Text; using System.Threading.Tasks; using Tango.Core; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Authentication; namespace Tango.MachineStudio.UI.Authentication diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Modules/DefaultStudioModuleLoader.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Modules/DefaultStudioModuleLoader.cs index 0e1bd829b..e08ee9b08 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Modules/DefaultStudioModuleLoader.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Modules/DefaultStudioModuleLoader.cs @@ -7,6 +7,7 @@ using System.Reflection; using System.Text; using System.Threading.Tasks; using Tango.Core; +using Tango.Integration.Observables; using Tango.MachineStudio.Common; using Tango.MachineStudio.Common.Authentication; using Tango.MachineStudio.Common.Modules; @@ -44,7 +45,7 @@ namespace Tango.MachineStudio.UI.Modules /// /// The sender. /// The e. - private void _authenticationProvider_CurrentUserChanged(object sender, DAL.Observables.User e) + private void _authenticationProvider_CurrentUserChanged(object sender, User e) { LoadModules(); } 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 fb8c023be..5490c2c2b 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 @@ -256,10 +256,6 @@ {a34ee0f0-649d-41c8-8489-b6f1cc6924ee} Tango.Core - - {0ecd6da8-7aa6-48d9-8b65-279d176ad9af} - Tango.DAL.Observables - {38197109-8610-4d3f-92b9-16d48df94d7c} Tango.DAL.Remote diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs index 54e2f9196..55a54e8aa 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/LoadingViewVM.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using Tango.Core.Helpers; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.MachineStudio.Common.Modules; using Tango.MachineStudio.Common.Navigation; using Tango.MachineStudio.Common.Notifications; diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml index 9d5ac4bb1..0c81791cd 100644 --- a/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml +++ b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml @@ -6,7 +6,7 @@ using System.ComponentModel.DataAnnotations.Schema; using System.Linq; using Tango.DAL.Remote.DB; -namespace Tango.DAL.Observables +namespace Tango.Integration.Observables { [Table("@(Model.TableName)")] public partial class @(Model.Name) : ObservableEntity<@(Model.Name)> @@ -14,7 +14,7 @@ namespace Tango.DAL.Observables @foreach (var prop in Model.Fields) {
- private @(prop.Type) _@(prop.Name.ToLower()); + protected @(prop.Type) _@(prop.Name.ToLower()); /// /// Gets or sets the @(Model.Name.ToLower()) @(prop.Description). /// diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Templates/EnumerationFile.cshtml b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EnumerationFile.cshtml index 408c9b3d5..a8a632679 100644 --- a/Software/Visual_Studio/Tango.CodeGeneration/Templates/EnumerationFile.cshtml +++ b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EnumerationFile.cshtml @@ -4,7 +4,7 @@ using System.Collections.ObjectModel; using System.Linq; using System.ComponentModel; -namespace Tango.DAL.Observables +namespace Tango.Integration.Observables { public enum @(Model.Name) { diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Templates/ObservablesAdapterFile.cshtml b/Software/Visual_Studio/Tango.CodeGeneration/Templates/ObservablesAdapterFile.cshtml index 856b8ac42..dce9b39e9 100644 --- a/Software/Visual_Studio/Tango.CodeGeneration/Templates/ObservablesAdapterFile.cshtml +++ b/Software/Visual_Studio/Tango.CodeGeneration/Templates/ObservablesAdapterFile.cshtml @@ -1,7 +1,7 @@ using System.Collections.ObjectModel; using System.ComponentModel; -namespace Tango.DAL.Observables +namespace Tango.Integration.Observables { public partial class @(Model.Name) { diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Templates/ObservablesContextCodeFile.cshtml b/Software/Visual_Studio/Tango.CodeGeneration/Templates/ObservablesContextCodeFile.cshtml index 43330235c..2094c0999 100644 --- a/Software/Visual_Studio/Tango.CodeGeneration/Templates/ObservablesContextCodeFile.cshtml +++ b/Software/Visual_Studio/Tango.CodeGeneration/Templates/ObservablesContextCodeFile.cshtml @@ -6,7 +6,7 @@ using System.Text; using System.Threading.Tasks; using Tango.Settings; -namespace Tango.DAL.Observables +namespace Tango.Integration.Observables { public class ObservablesContext : DbContext { diff --git a/Software/Visual_Studio/Tango.Core/ExtensionMethods/ObjectExtensions.cs b/Software/Visual_Studio/Tango.Core/ExtensionMethods/ObjectExtensions.cs index 25cfe0a85..88403f8a6 100644 --- a/Software/Visual_Studio/Tango.Core/ExtensionMethods/ObjectExtensions.cs +++ b/Software/Visual_Studio/Tango.Core/ExtensionMethods/ObjectExtensions.cs @@ -41,7 +41,7 @@ public static class ObjectExtensions /// The destination object. public static void ShallowCopyTo(this T source, T destination) { - foreach (var prop in typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance)) + foreach (var prop in typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance).Where(x => x.SetMethod != null)) { if (!prop.PropertyType.IsGenericType) { diff --git a/Software/Visual_Studio/Tango.DAL.Observables/App.config b/Software/Visual_Studio/Tango.DAL.Observables/App.config deleted file mode 100644 index 2fb423e8b..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/App.config +++ /dev/null @@ -1,13 +0,0 @@ - - - - -
- - - - - - - - \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/ActionType.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/ActionType.cs deleted file mode 100644 index f3b675bbe..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/ActionType.cs +++ /dev/null @@ -1,104 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("ACTION_TYPES")] - public partial class ActionType : ObservableEntity - { - - private Int32 _code; - /// - /// Gets or sets the actiontype code. - /// - [Column("CODE")] - - public Int32 Code - { - get - { - return _code; - } - - set - { - _code = value; RaisePropertyChanged(nameof(Code)); - } - - } - - private String _name; - /// - /// Gets or sets the actiontype name. - /// - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private String _description; - /// - /// Gets or sets the actiontype description. - /// - [Column("DESCRIPTION")] - - public String Description - { - get - { - return _description; - } - - set - { - _description = value; RaisePropertyChanged(nameof(Description)); - } - - } - - private ObservableCollection _eventtypesactions; - /// - /// Gets or sets the actiontype event types actions. - /// - - public virtual ObservableCollection EventTypesActions - { - get - { - return _eventtypesactions; - } - - set - { - _eventtypesactions = value; RaisePropertyChanged(nameof(EventTypesActions)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public ActionType() : base() - { - - EventTypesActions = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Address.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Address.cs deleted file mode 100644 index cb144e7bf..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Address.cs +++ /dev/null @@ -1,225 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("ADDRESSES")] - public partial class Address : ObservableEntity
- { - - private Boolean _deleted; - /// - /// Gets or sets the address deleted. - /// - [Column("DELETED")] - - public Boolean Deleted - { - get - { - return _deleted; - } - - set - { - _deleted = value; RaisePropertyChanged(nameof(Deleted)); - } - - } - - private String _addressstring; - /// - /// Gets or sets the address address string. - /// - [Column("ADDRESS_STRING")] - - public String AddressString - { - get - { - return _addressstring; - } - - set - { - _addressstring = value; RaisePropertyChanged(nameof(AddressString)); - } - - } - - private String _locality; - /// - /// Gets or sets the address locality. - /// - [Column("LOCALITY")] - - public String Locality - { - get - { - return _locality; - } - - set - { - _locality = value; RaisePropertyChanged(nameof(Locality)); - } - - } - - private String _country; - /// - /// Gets or sets the address country. - /// - [Column("COUNTRY")] - - public String Country - { - get - { - return _country; - } - - set - { - _country = value; RaisePropertyChanged(nameof(Country)); - } - - } - - private String _city; - /// - /// Gets or sets the address city. - /// - [Column("CITY")] - - public String City - { - get - { - return _city; - } - - set - { - _city = value; RaisePropertyChanged(nameof(City)); - } - - } - - private String _state; - /// - /// Gets or sets the address state. - /// - [Column("STATE")] - - public String State - { - get - { - return _state; - } - - set - { - _state = value; RaisePropertyChanged(nameof(State)); - } - - } - - private String _countrycode; - /// - /// Gets or sets the address country code. - /// - [Column("COUNTRY_CODE")] - - public String CountryCode - { - get - { - return _countrycode; - } - - set - { - _countrycode = value; RaisePropertyChanged(nameof(CountryCode)); - } - - } - - private String _postalcode; - /// - /// Gets or sets the address postal code. - /// - [Column("POSTAL_CODE")] - - public String PostalCode - { - get - { - return _postalcode; - } - - set - { - _postalcode = value; RaisePropertyChanged(nameof(PostalCode)); - } - - } - - private ObservableCollection _organizations; - /// - /// Gets or sets the address organizations. - /// - - public virtual ObservableCollection Organizations - { - get - { - return _organizations; - } - - set - { - _organizations = value; RaisePropertyChanged(nameof(Organizations)); - } - - } - - private ObservableCollection _users; - /// - /// Gets or sets the address users. - /// - - public virtual ObservableCollection Users - { - get - { - return _users; - } - - set - { - _users = value; RaisePropertyChanged(nameof(Users)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public Address() : base() - { - - Organizations = new ObservableCollection(); - - Users = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/ApplicationDisplayPanelVersion.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/ApplicationDisplayPanelVersion.cs deleted file mode 100644 index 8848bb59a..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/ApplicationDisplayPanelVersion.cs +++ /dev/null @@ -1,84 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("APPLICATION_DISPLAY_PANEL_VERSIONS")] - public partial class ApplicationDisplayPanelVersion : ObservableEntity - { - - private Double _version; - /// - /// Gets or sets the applicationdisplaypanelversion version. - /// - [Column("VERSION")] - - public Double Version - { - get - { - return _version; - } - - set - { - _version = value; RaisePropertyChanged(nameof(Version)); - } - - } - - private String _name; - /// - /// Gets or sets the applicationdisplaypanelversion name. - /// - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private ObservableCollection _configurations; - /// - /// Gets or sets the applicationdisplaypanelversion configurations. - /// - - public virtual ObservableCollection Configurations - { - get - { - return _configurations; - } - - set - { - _configurations = value; RaisePropertyChanged(nameof(Configurations)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public ApplicationDisplayPanelVersion() : base() - { - - Configurations = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/ApplicationFirmwareVersion.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/ApplicationFirmwareVersion.cs deleted file mode 100644 index e85186be2..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/ApplicationFirmwareVersion.cs +++ /dev/null @@ -1,84 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("APPLICATION_FIRMWARE_VERSIONS")] - public partial class ApplicationFirmwareVersion : ObservableEntity - { - - private Double _version; - /// - /// Gets or sets the applicationfirmwareversion version. - /// - [Column("VERSION")] - - public Double Version - { - get - { - return _version; - } - - set - { - _version = value; RaisePropertyChanged(nameof(Version)); - } - - } - - private String _name; - /// - /// Gets or sets the applicationfirmwareversion name. - /// - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private ObservableCollection _configurations; - /// - /// Gets or sets the applicationfirmwareversion configurations. - /// - - public virtual ObservableCollection Configurations - { - get - { - return _configurations; - } - - set - { - _configurations = value; RaisePropertyChanged(nameof(Configurations)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public ApplicationFirmwareVersion() : base() - { - - Configurations = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/ApplicationOsVersion.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/ApplicationOsVersion.cs deleted file mode 100644 index 5c7cd70b5..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/ApplicationOsVersion.cs +++ /dev/null @@ -1,84 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("APPLICATION_OS_VERSIONS")] - public partial class ApplicationOsVersion : ObservableEntity - { - - private Double _version; - /// - /// Gets or sets the applicationosversion version. - /// - [Column("VERSION")] - - public Double Version - { - get - { - return _version; - } - - set - { - _version = value; RaisePropertyChanged(nameof(Version)); - } - - } - - private String _name; - /// - /// Gets or sets the applicationosversion name. - /// - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private ObservableCollection _configurations; - /// - /// Gets or sets the applicationosversion configurations. - /// - - public virtual ObservableCollection Configurations - { - get - { - return _configurations; - } - - set - { - _configurations = value; RaisePropertyChanged(nameof(Configurations)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public ApplicationOsVersion() : base() - { - - Configurations = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/ApplicationVersion.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/ApplicationVersion.cs deleted file mode 100644 index 885f647f0..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/ApplicationVersion.cs +++ /dev/null @@ -1,84 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("APPLICATION_VERSIONS")] - public partial class ApplicationVersion : ObservableEntity - { - - private Double _version; - /// - /// Gets or sets the applicationversion version. - /// - [Column("VERSION")] - - public Double Version - { - get - { - return _version; - } - - set - { - _version = value; RaisePropertyChanged(nameof(Version)); - } - - } - - private String _name; - /// - /// Gets or sets the applicationversion name. - /// - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private ObservableCollection _configurations; - /// - /// Gets or sets the applicationversion configurations. - /// - - public virtual ObservableCollection Configurations - { - get - { - return _configurations; - } - - set - { - _configurations = value; RaisePropertyChanged(nameof(Configurations)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public ApplicationVersion() : base() - { - - Configurations = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/BrushStop.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/BrushStop.cs deleted file mode 100644 index 2f5ad1e8e..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/BrushStop.cs +++ /dev/null @@ -1,519 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("BRUSH_STOPS")] - public partial class BrushStop : ObservableEntity - { - - private String _segmentguid; - /// - /// Gets or sets the brushstop segment guid. - /// - [Column("SEGMENT_GUID")] - [ForeignKey("Segment")] - public String SegmentGuid - { - get - { - return _segmentguid; - } - - set - { - _segmentguid = value; RaisePropertyChanged(nameof(SegmentGuid)); - } - - } - - private String _colorspaceguid; - /// - /// Gets or sets the brushstop color space guid. - /// - [Column("COLOR_SPACE_GUID")] - [ForeignKey("ColorSpace")] - public String ColorSpaceGuid - { - get - { - return _colorspaceguid; - } - - set - { - _colorspaceguid = value; RaisePropertyChanged(nameof(ColorSpaceGuid)); - } - - } - - private Double _offsetpercent; - /// - /// Gets or sets the brushstop offset percent. - /// - [Column("OFFSET_PERCENT")] - - public Double OffsetPercent - { - get - { - return _offsetpercent; - } - - set - { - _offsetpercent = value; RaisePropertyChanged(nameof(OffsetPercent)); - } - - } - - private Int32 _stopindex; - /// - /// Gets or sets the brushstop stop index. - /// - [Column("STOP_INDEX")] - - public Int32 StopIndex - { - get - { - return _stopindex; - } - - set - { - _stopindex = value; RaisePropertyChanged(nameof(StopIndex)); - } - - } - - private Double _cyan; - /// - /// Gets or sets the brushstop cyan. - /// - [Column("CYAN")] - - public Double Cyan - { - get - { - return _cyan; - } - - set - { - _cyan = value; RaisePropertyChanged(nameof(Cyan)); - } - - } - - private Double _magenta; - /// - /// Gets or sets the brushstop magenta. - /// - [Column("MAGENTA")] - - public Double Magenta - { - get - { - return _magenta; - } - - set - { - _magenta = value; RaisePropertyChanged(nameof(Magenta)); - } - - } - - private Double _yellow; - /// - /// Gets or sets the brushstop yellow. - /// - [Column("YELLOW")] - - public Double Yellow - { - get - { - return _yellow; - } - - set - { - _yellow = value; RaisePropertyChanged(nameof(Yellow)); - } - - } - - private Double _black; - /// - /// Gets or sets the brushstop black. - /// - [Column("BLACK")] - - public Double Black - { - get - { - return _black; - } - - set - { - _black = value; RaisePropertyChanged(nameof(Black)); - } - - } - - private Int32 _red; - /// - /// Gets or sets the brushstop red. - /// - [Column("RED")] - - public Int32 Red - { - get - { - return _red; - } - - set - { - _red = value; RaisePropertyChanged(nameof(Red)); - } - - } - - private Int32 _green; - /// - /// Gets or sets the brushstop green. - /// - [Column("GREEN")] - - public Int32 Green - { - get - { - return _green; - } - - set - { - _green = value; RaisePropertyChanged(nameof(Green)); - } - - } - - private Int32 _blue; - /// - /// Gets or sets the brushstop blue. - /// - [Column("BLUE")] - - public Int32 Blue - { - get - { - return _blue; - } - - set - { - _blue = value; RaisePropertyChanged(nameof(Blue)); - } - - } - - private Double _l; - /// - /// Gets or sets the brushstop l. - /// - [Column("L")] - - public Double L - { - get - { - return _l; - } - - set - { - _l = value; RaisePropertyChanged(nameof(L)); - } - - } - - private Double _a; - /// - /// Gets or sets the brushstop a. - /// - [Column("A")] - - public Double A - { - get - { - return _a; - } - - set - { - _a = value; RaisePropertyChanged(nameof(A)); - } - - } - - private Double _b; - /// - /// Gets or sets the brushstop b. - /// - [Column("B")] - - public Double B - { - get - { - return _b; - } - - set - { - _b = value; RaisePropertyChanged(nameof(B)); - } - - } - - private Double _v0; - /// - /// Gets or sets the brushstop v0. - /// - [Column("V0")] - - public Double V0 - { - get - { - return _v0; - } - - set - { - _v0 = value; RaisePropertyChanged(nameof(V0)); - } - - } - - private Double _v1; - /// - /// Gets or sets the brushstop v1. - /// - [Column("V1")] - - public Double V1 - { - get - { - return _v1; - } - - set - { - _v1 = value; RaisePropertyChanged(nameof(V1)); - } - - } - - private Double _v2; - /// - /// Gets or sets the brushstop v2. - /// - [Column("V2")] - - public Double V2 - { - get - { - return _v2; - } - - set - { - _v2 = value; RaisePropertyChanged(nameof(V2)); - } - - } - - private Double _v3; - /// - /// Gets or sets the brushstop v3. - /// - [Column("V3")] - - public Double V3 - { - get - { - return _v3; - } - - set - { - _v3 = value; RaisePropertyChanged(nameof(V3)); - } - - } - - private Double _v4; - /// - /// Gets or sets the brushstop v4. - /// - [Column("V4")] - - public Double V4 - { - get - { - return _v4; - } - - set - { - _v4 = value; RaisePropertyChanged(nameof(V4)); - } - - } - - private Double _v5; - /// - /// Gets or sets the brushstop v5. - /// - [Column("V5")] - - public Double V5 - { - get - { - return _v5; - } - - set - { - _v5 = value; RaisePropertyChanged(nameof(V5)); - } - - } - - private Double _v6; - /// - /// Gets or sets the brushstop v6. - /// - [Column("V6")] - - public Double V6 - { - get - { - return _v6; - } - - set - { - _v6 = value; RaisePropertyChanged(nameof(V6)); - } - - } - - private Double _v7; - /// - /// Gets or sets the brushstop v7. - /// - [Column("V7")] - - public Double V7 - { - get - { - return _v7; - } - - set - { - _v7 = value; RaisePropertyChanged(nameof(V7)); - } - - } - - private String _pantonguid; - /// - /// Gets or sets the brushstop panton guid. - /// - [Column("PANTON_GUID")] - public String PantonGuid - { - get - { - return _pantonguid; - } - - set - { - _pantonguid = value; RaisePropertyChanged(nameof(PantonGuid)); - } - - } - - private ColorSpace _colorspace; - /// - /// Gets or sets the brushstop color spaces. - /// - - public virtual ColorSpace ColorSpace - { - get - { - return _colorspace; - } - - set - { - _colorspace = value; RaisePropertyChanged(nameof(ColorSpace)); - } - - } - - private Segment _segment; - /// - /// Gets or sets the brushstop segment. - /// - - public virtual Segment Segment - { - get - { - return _segment; - } - - set - { - _segment = value; RaisePropertyChanged(nameof(Segment)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public BrushStop() : base() - { - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/CartridgeType.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/CartridgeType.cs deleted file mode 100644 index 3b1bba423..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/CartridgeType.cs +++ /dev/null @@ -1,84 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("CARTRIDGE_TYPES")] - public partial class CartridgeType : ObservableEntity - { - - private Int32 _code; - /// - /// Gets or sets the cartridgetype code. - /// - [Column("CODE")] - - public Int32 Code - { - get - { - return _code; - } - - set - { - _code = value; RaisePropertyChanged(nameof(Code)); - } - - } - - private String _name; - /// - /// Gets or sets the cartridgetype name. - /// - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private ObservableCollection _idspacks; - /// - /// Gets or sets the cartridgetype ids packs. - /// - - public virtual ObservableCollection IdsPacks - { - get - { - return _idspacks; - } - - set - { - _idspacks = value; RaisePropertyChanged(nameof(IdsPacks)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public CartridgeType() : base() - { - - IdsPacks = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Cat.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Cat.cs deleted file mode 100644 index 89a00cc85..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Cat.cs +++ /dev/null @@ -1,140 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("CATS")] - public partial class Cat : ObservableEntity - { - - private String _name; - /// - /// Gets or sets the cat name. - /// - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private String _liquidtypeguid; - /// - /// Gets or sets the cat liquid type guid. - /// - [Column("LIQUID_TYPE_GUID")] - [ForeignKey("LiquidType")] - public String LiquidTypeGuid - { - get - { - return _liquidtypeguid; - } - - set - { - _liquidtypeguid = value; RaisePropertyChanged(nameof(LiquidTypeGuid)); - } - - } - - private String _rmlguid; - /// - /// Gets or sets the cat rml guid. - /// - [Column("RML_GUID")] - [ForeignKey("Rml")] - public String RmlGuid - { - get - { - return _rmlguid; - } - - set - { - _rmlguid = value; RaisePropertyChanged(nameof(RmlGuid)); - } - - } - - private Byte[] _data; - /// - /// Gets or sets the cat data. - /// - [Column("DATA")] - - public Byte[] Data - { - get - { - return _data; - } - - set - { - _data = value; RaisePropertyChanged(nameof(Data)); - } - - } - - private LiquidType _liquidtype; - /// - /// Gets or sets the cat liquid types. - /// - - public virtual LiquidType LiquidType - { - get - { - return _liquidtype; - } - - set - { - _liquidtype = value; RaisePropertyChanged(nameof(LiquidType)); - } - - } - - private Rml _rml; - /// - /// Gets or sets the cat rml. - /// - - public virtual Rml Rml - { - get - { - return _rml; - } - - set - { - _rml = value; RaisePropertyChanged(nameof(Rml)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public Cat() : base() - { - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Cct.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Cct.cs deleted file mode 100644 index dcca67aab..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Cct.cs +++ /dev/null @@ -1,201 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("CCTS")] - public partial class Cct : ObservableEntity - { - - private String _name; - /// - /// Gets or sets the cct name. - /// - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private String _description; - /// - /// Gets or sets the cct description. - /// - [Column("DESCRIPTION")] - - public String Description - { - get - { - return _description; - } - - set - { - _description = value; RaisePropertyChanged(nameof(Description)); - } - - } - - private String _forwardfilename; - /// - /// Gets or sets the cct forward file name. - /// - [Column("FORWARD_FILE_NAME")] - - public String ForwardFileName - { - get - { - return _forwardfilename; - } - - set - { - _forwardfilename = value; RaisePropertyChanged(nameof(ForwardFileName)); - } - - } - - private String _inversefilename; - /// - /// Gets or sets the cct inverse file name. - /// - [Column("INVERSE_FILE_NAME")] - - public String InverseFileName - { - get - { - return _inversefilename; - } - - set - { - _inversefilename = value; RaisePropertyChanged(nameof(InverseFileName)); - } - - } - - private Byte[] _forwarddata; - /// - /// Gets or sets the cct forward data. - /// - [Column("FORWARD_DATA")] - - public Byte[] ForwardData - { - get - { - return _forwarddata; - } - - set - { - _forwarddata = value; RaisePropertyChanged(nameof(ForwardData)); - } - - } - - private Byte[] _inversedata; - /// - /// Gets or sets the cct inverse data. - /// - [Column("INVERSE_DATA")] - - public Byte[] InverseData - { - get - { - return _inversedata; - } - - set - { - _inversedata = value; RaisePropertyChanged(nameof(InverseData)); - } - - } - - private Double _version; - /// - /// Gets or sets the cct version. - /// - [Column("VERSION")] - - public Double Version - { - get - { - return _version; - } - - set - { - _version = value; RaisePropertyChanged(nameof(Version)); - } - - } - - private String _rmlguid; - /// - /// Gets or sets the cct rml guid. - /// - [Column("RML_GUID")] - [ForeignKey("Rml")] - public String RmlGuid - { - get - { - return _rmlguid; - } - - set - { - _rmlguid = value; RaisePropertyChanged(nameof(RmlGuid)); - } - - } - - private Rml _rml; - /// - /// Gets or sets the cct rml. - /// - - public virtual Rml Rml - { - get - { - return _rml; - } - - set - { - _rml = value; RaisePropertyChanged(nameof(Rml)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public Cct() : base() - { - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/ColorSpace.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/ColorSpace.cs deleted file mode 100644 index 98f745bff..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/ColorSpace.cs +++ /dev/null @@ -1,104 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("COLOR_SPACES")] - public partial class ColorSpace : ObservableEntity - { - - private Int32 _code; - /// - /// Gets or sets the colorspace code. - /// - [Column("CODE")] - - public Int32 Code - { - get - { - return _code; - } - - set - { - _code = value; RaisePropertyChanged(nameof(Code)); - } - - } - - private String _name; - /// - /// Gets or sets the colorspace name. - /// - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private String _description; - /// - /// Gets or sets the colorspace description. - /// - [Column("DESCRIPTION")] - - public String Description - { - get - { - return _description; - } - - set - { - _description = value; RaisePropertyChanged(nameof(Description)); - } - - } - - private ObservableCollection _brushstops; - /// - /// Gets or sets the colorspace brush stops. - /// - - public virtual ObservableCollection BrushStops - { - get - { - return _brushstops; - } - - set - { - _brushstops = value; RaisePropertyChanged(nameof(BrushStops)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public ColorSpace() : base() - { - - BrushStops = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Configuration.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Configuration.cs deleted file mode 100644 index 323fb7b39..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Configuration.cs +++ /dev/null @@ -1,420 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("CONFIGURATIONS")] - public partial class Configuration : ObservableEntity - { - - private String _name; - /// - /// Gets or sets the configuration name. - /// - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private DateTime _creationdate; - /// - /// Gets or sets the configuration creation date. - /// - [Column("CREATION_DATE")] - - public DateTime CreationDate - { - get - { - return _creationdate; - } - - set - { - _creationdate = value; RaisePropertyChanged(nameof(CreationDate)); - } - - } - - private String _applicationversionguid; - /// - /// Gets or sets the configuration application version guid. - /// - [Column("APPLICATION_VERSION_GUID")] - [ForeignKey("ApplicationVersion")] - public String ApplicationVersionGuid - { - get - { - return _applicationversionguid; - } - - set - { - _applicationversionguid = value; RaisePropertyChanged(nameof(ApplicationVersionGuid)); - } - - } - - private String _applicationosversionguid; - /// - /// Gets or sets the configuration application os version guid. - /// - [Column("APPLICATION_OS_VERSION_GUID")] - [ForeignKey("ApplicationOsVersion")] - public String ApplicationOsVersionGuid - { - get - { - return _applicationosversionguid; - } - - set - { - _applicationosversionguid = value; RaisePropertyChanged(nameof(ApplicationOsVersionGuid)); - } - - } - - private String _applicationfirmwareversionguid; - /// - /// Gets or sets the configuration application firmware version guid. - /// - [Column("APPLICATION_FIRMWARE_VERSION_GUID")] - [ForeignKey("ApplicationFirmwareVersion")] - public String ApplicationFirmwareVersionGuid - { - get - { - return _applicationfirmwareversionguid; - } - - set - { - _applicationfirmwareversionguid = value; RaisePropertyChanged(nameof(ApplicationFirmwareVersionGuid)); - } - - } - - private String _applicationdisplaypanelversionguid; - /// - /// Gets or sets the configuration application display panel version guid. - /// - [Column("APPLICATION_DISPLAY_PANEL_VERSION_GUID")] - [ForeignKey("ApplicationDisplayPanelVersion")] - public String ApplicationDisplayPanelVersionGuid - { - get - { - return _applicationdisplaypanelversionguid; - } - - set - { - _applicationdisplaypanelversionguid = value; RaisePropertyChanged(nameof(ApplicationDisplayPanelVersionGuid)); - } - - } - - private String _embeddedfirmwareversionguid; - /// - /// Gets or sets the configuration embedded firmware version guid. - /// - [Column("EMBEDDED_FIRMWARE_VERSION_GUID")] - [ForeignKey("EmbeddedFirmwareVersion")] - public String EmbeddedFirmwareVersionGuid - { - get - { - return _embeddedfirmwareversionguid; - } - - set - { - _embeddedfirmwareversionguid = value; RaisePropertyChanged(nameof(EmbeddedFirmwareVersionGuid)); - } - - } - - private String _embeddedsoftwareversionguid; - /// - /// Gets or sets the configuration embedded software version guid. - /// - [Column("EMBEDDED_SOFTWARE_VERSION_GUID")] - [ForeignKey("EmbeddedSoftwareVersion")] - public String EmbeddedSoftwareVersionGuid - { - get - { - return _embeddedsoftwareversionguid; - } - - set - { - _embeddedsoftwareversionguid = value; RaisePropertyChanged(nameof(EmbeddedSoftwareVersionGuid)); - } - - } - - private String _hardwareversionguid; - /// - /// Gets or sets the configuration hardware version guid. - /// - [Column("HARDWARE_VERSION_GUID")] - [ForeignKey("HardwareVersion")] - public String HardwareVersionGuid - { - get - { - return _hardwareversionguid; - } - - set - { - _hardwareversionguid = value; RaisePropertyChanged(nameof(HardwareVersionGuid)); - } - - } - - private ApplicationDisplayPanelVersion _applicationdisplaypanelversion; - /// - /// Gets or sets the configuration application display panel versions. - /// - - public virtual ApplicationDisplayPanelVersion ApplicationDisplayPanelVersion - { - get - { - return _applicationdisplaypanelversion; - } - - set - { - _applicationdisplaypanelversion = value; RaisePropertyChanged(nameof(ApplicationDisplayPanelVersion)); - } - - } - - private ApplicationFirmwareVersion _applicationfirmwareversion; - /// - /// Gets or sets the configuration application firmware versions. - /// - - public virtual ApplicationFirmwareVersion ApplicationFirmwareVersion - { - get - { - return _applicationfirmwareversion; - } - - set - { - _applicationfirmwareversion = value; RaisePropertyChanged(nameof(ApplicationFirmwareVersion)); - } - - } - - private ApplicationOsVersion _applicationosversion; - /// - /// Gets or sets the configuration application os versions. - /// - - public virtual ApplicationOsVersion ApplicationOsVersion - { - get - { - return _applicationosversion; - } - - set - { - _applicationosversion = value; RaisePropertyChanged(nameof(ApplicationOsVersion)); - } - - } - - private ApplicationVersion _applicationversion; - /// - /// Gets or sets the configuration application versions. - /// - - public virtual ApplicationVersion ApplicationVersion - { - get - { - return _applicationversion; - } - - set - { - _applicationversion = value; RaisePropertyChanged(nameof(ApplicationVersion)); - } - - } - - private EmbeddedFirmwareVersion _embeddedfirmwareversion; - /// - /// Gets or sets the configuration embedded firmware versions. - /// - - public virtual EmbeddedFirmwareVersion EmbeddedFirmwareVersion - { - get - { - return _embeddedfirmwareversion; - } - - set - { - _embeddedfirmwareversion = value; RaisePropertyChanged(nameof(EmbeddedFirmwareVersion)); - } - - } - - private EmbeddedSoftwareVersion _embeddedsoftwareversion; - /// - /// Gets or sets the configuration embedded software versions. - /// - - public virtual EmbeddedSoftwareVersion EmbeddedSoftwareVersion - { - get - { - return _embeddedsoftwareversion; - } - - set - { - _embeddedsoftwareversion = value; RaisePropertyChanged(nameof(EmbeddedSoftwareVersion)); - } - - } - - private HardwareVersion _hardwareversion; - /// - /// Gets or sets the configuration hardware versions. - /// - - public virtual HardwareVersion HardwareVersion - { - get - { - return _hardwareversion; - } - - set - { - _hardwareversion = value; RaisePropertyChanged(nameof(HardwareVersion)); - } - - } - - private ObservableCollection _idspacks; - /// - /// Gets or sets the configuration ids packs. - /// - - public virtual ObservableCollection IdsPacks - { - get - { - return _idspacks; - } - - set - { - _idspacks = value; RaisePropertyChanged(nameof(IdsPacks)); - } - - } - - private ObservableCollection _machineversions; - /// - /// Gets or sets the configuration machine versions. - /// - - public virtual ObservableCollection MachineVersions - { - get - { - return _machineversions; - } - - set - { - _machineversions = value; RaisePropertyChanged(nameof(MachineVersions)); - } - - } - - private ObservableCollection _machines; - /// - /// Gets or sets the configuration machines. - /// - - public virtual ObservableCollection Machines - { - get - { - return _machines; - } - - set - { - _machines = value; RaisePropertyChanged(nameof(Machines)); - } - - } - - private ObservableCollection _machinesconfigurations; - /// - /// Gets or sets the configuration machines configurations. - /// - - public virtual ObservableCollection MachinesConfigurations - { - get - { - return _machinesconfigurations; - } - - set - { - _machinesconfigurations = value; RaisePropertyChanged(nameof(MachinesConfigurations)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public Configuration() : base() - { - - IdsPacks = new ObservableCollection(); - - MachineVersions = new ObservableCollection(); - - Machines = new ObservableCollection(); - - MachinesConfigurations = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Contact.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Contact.cs deleted file mode 100644 index c310451ac..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Contact.cs +++ /dev/null @@ -1,205 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("CONTACTS")] - public partial class Contact : ObservableEntity - { - - private Boolean _deleted; - /// - /// Gets or sets the contact deleted. - /// - [Column("DELETED")] - - public Boolean Deleted - { - get - { - return _deleted; - } - - set - { - _deleted = value; RaisePropertyChanged(nameof(Deleted)); - } - - } - - private String _firstname; - /// - /// Gets or sets the contact first name. - /// - [Column("FIRST_NAME")] - - public String FirstName - { - get - { - return _firstname; - } - - set - { - _firstname = value; RaisePropertyChanged(nameof(FirstName)); - } - - } - - private String _lastname; - /// - /// Gets or sets the contact last name. - /// - [Column("LAST_NAME")] - - public String LastName - { - get - { - return _lastname; - } - - set - { - _lastname = value; RaisePropertyChanged(nameof(LastName)); - } - - } - - private String _fullname; - /// - /// Gets or sets the contact full name. - /// - [Column("FULL_NAME")] - - public String FullName - { - get - { - return _fullname; - } - - set - { - _fullname = value; RaisePropertyChanged(nameof(FullName)); - } - - } - - private String _email; - /// - /// Gets or sets the contact email. - /// - [Column("EMAIL")] - - public String Email - { - get - { - return _email; - } - - set - { - _email = value; RaisePropertyChanged(nameof(Email)); - } - - } - - private String _phonenumber; - /// - /// Gets or sets the contact phone number. - /// - [Column("PHONE_NUMBER")] - - public String PhoneNumber - { - get - { - return _phonenumber; - } - - set - { - _phonenumber = value; RaisePropertyChanged(nameof(PhoneNumber)); - } - - } - - private String _fax; - /// - /// Gets or sets the contact fax. - /// - [Column("FAX")] - - public String Fax - { - get - { - return _fax; - } - - set - { - _fax = value; RaisePropertyChanged(nameof(Fax)); - } - - } - - private ObservableCollection _organizations; - /// - /// Gets or sets the contact organizations. - /// - - public virtual ObservableCollection Organizations - { - get - { - return _organizations; - } - - set - { - _organizations = value; RaisePropertyChanged(nameof(Organizations)); - } - - } - - private ObservableCollection _users; - /// - /// Gets or sets the contact users. - /// - - public virtual ObservableCollection Users - { - get - { - return _users; - } - - set - { - _users = value; RaisePropertyChanged(nameof(Users)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public Contact() : base() - { - - Organizations = new ObservableCollection(); - - Users = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/DispenserType.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/DispenserType.cs deleted file mode 100644 index 04b3258e3..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/DispenserType.cs +++ /dev/null @@ -1,124 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("DISPENSER_TYPES")] - public partial class DispenserType : ObservableEntity - { - - private Int32 _code; - /// - /// Gets or sets the dispensertype code. - /// - [Column("CODE")] - - public Int32 Code - { - get - { - return _code; - } - - set - { - _code = value; RaisePropertyChanged(nameof(Code)); - } - - } - - private String _name; - /// - /// Gets or sets the dispensertype name. - /// - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private Double _nlperpulse; - /// - /// Gets or sets the dispensertype nl per pulse. - /// - [Column("NL_PER_PULSE")] - - public Double NlPerPulse - { - get - { - return _nlperpulse; - } - - set - { - _nlperpulse = value; RaisePropertyChanged(nameof(NlPerPulse)); - } - - } - - private Double _capacity; - /// - /// Gets or sets the dispensertype capacity. - /// - [Column("CAPACITY")] - - public Double Capacity - { - get - { - return _capacity; - } - - set - { - _capacity = value; RaisePropertyChanged(nameof(Capacity)); - } - - } - - private ObservableCollection _idspacks; - /// - /// Gets or sets the dispensertype ids packs. - /// - - public virtual ObservableCollection IdsPacks - { - get - { - return _idspacks; - } - - set - { - _idspacks = value; RaisePropertyChanged(nameof(IdsPacks)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public DispenserType() : base() - { - - IdsPacks = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/EmbeddedFirmwareVersion.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/EmbeddedFirmwareVersion.cs deleted file mode 100644 index d10426933..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/EmbeddedFirmwareVersion.cs +++ /dev/null @@ -1,84 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("EMBEDDED_FIRMWARE_VERSIONS")] - public partial class EmbeddedFirmwareVersion : ObservableEntity - { - - private Double _version; - /// - /// Gets or sets the embeddedfirmwareversion version. - /// - [Column("VERSION")] - - public Double Version - { - get - { - return _version; - } - - set - { - _version = value; RaisePropertyChanged(nameof(Version)); - } - - } - - private String _name; - /// - /// Gets or sets the embeddedfirmwareversion name. - /// - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private ObservableCollection _configurations; - /// - /// Gets or sets the embeddedfirmwareversion configurations. - /// - - public virtual ObservableCollection Configurations - { - get - { - return _configurations; - } - - set - { - _configurations = value; RaisePropertyChanged(nameof(Configurations)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public EmbeddedFirmwareVersion() : base() - { - - Configurations = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/EmbeddedSoftwareVersion.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/EmbeddedSoftwareVersion.cs deleted file mode 100644 index 55a8ca985..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/EmbeddedSoftwareVersion.cs +++ /dev/null @@ -1,84 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("EMBEDDED_SOFTWARE_VERSIONS")] - public partial class EmbeddedSoftwareVersion : ObservableEntity - { - - private Double _version; - /// - /// Gets or sets the embeddedsoftwareversion version. - /// - [Column("VERSION")] - - public Double Version - { - get - { - return _version; - } - - set - { - _version = value; RaisePropertyChanged(nameof(Version)); - } - - } - - private String _name; - /// - /// Gets or sets the embeddedsoftwareversion name. - /// - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private ObservableCollection _configurations; - /// - /// Gets or sets the embeddedsoftwareversion configurations. - /// - - public virtual ObservableCollection Configurations - { - get - { - return _configurations; - } - - set - { - _configurations = value; RaisePropertyChanged(nameof(Configurations)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public EmbeddedSoftwareVersion() : base() - { - - Configurations = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/EventType.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/EventType.cs deleted file mode 100644 index a26fe70dc..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/EventType.cs +++ /dev/null @@ -1,125 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("EVENT_TYPES")] - public partial class EventType : ObservableEntity - { - - private Int32 _code; - /// - /// Gets or sets the eventtype code. - /// - [Column("CODE")] - - public Int32 Code - { - get - { - return _code; - } - - set - { - _code = value; RaisePropertyChanged(nameof(Code)); - } - - } - - private String _name; - /// - /// Gets or sets the eventtype name. - /// - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private String _description; - /// - /// Gets or sets the eventtype description. - /// - [Column("DESCRIPTION")] - - public String Description - { - get - { - return _description; - } - - set - { - _description = value; RaisePropertyChanged(nameof(Description)); - } - - } - - private ObservableCollection _eventtypesactions; - /// - /// Gets or sets the eventtype event types actions. - /// - - public virtual ObservableCollection EventTypesActions - { - get - { - return _eventtypesactions; - } - - set - { - _eventtypesactions = value; RaisePropertyChanged(nameof(EventTypesActions)); - } - - } - - private ObservableCollection _machinesevents; - /// - /// Gets or sets the eventtype machines events. - /// - - public virtual ObservableCollection MachinesEvents - { - get - { - return _machinesevents; - } - - set - { - _machinesevents = value; RaisePropertyChanged(nameof(MachinesEvents)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public EventType() : base() - { - - EventTypesActions = new ObservableCollection(); - - MachinesEvents = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/EventTypesAction.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/EventTypesAction.cs deleted file mode 100644 index 87f552957..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/EventTypesAction.cs +++ /dev/null @@ -1,100 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("EVENT_TYPES_ACTIONS")] - public partial class EventTypesAction : ObservableEntity - { - - private String _eventtypeguid; - /// - /// Gets or sets the eventtypesaction event type guid. - /// - [Column("EVENT_TYPE_GUID")] - [ForeignKey("EventType")] - public String EventTypeGuid - { - get - { - return _eventtypeguid; - } - - set - { - _eventtypeguid = value; RaisePropertyChanged(nameof(EventTypeGuid)); - } - - } - - private String _actiontypeguid; - /// - /// Gets or sets the eventtypesaction action type guid. - /// - [Column("ACTION_TYPE_GUID")] - [ForeignKey("ActionType")] - public String ActionTypeGuid - { - get - { - return _actiontypeguid; - } - - set - { - _actiontypeguid = value; RaisePropertyChanged(nameof(ActionTypeGuid)); - } - - } - - private ActionType _actiontype; - /// - /// Gets or sets the eventtypesaction action types. - /// - - public virtual ActionType ActionType - { - get - { - return _actiontype; - } - - set - { - _actiontype = value; RaisePropertyChanged(nameof(ActionType)); - } - - } - - private EventType _eventtype; - /// - /// Gets or sets the eventtypesaction event types. - /// - - public virtual EventType EventType - { - get - { - return _eventtype; - } - - set - { - _eventtype = value; RaisePropertyChanged(nameof(EventType)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public EventTypesAction() : base() - { - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/FiberShape.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/FiberShape.cs deleted file mode 100644 index 4d91a522b..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/FiberShape.cs +++ /dev/null @@ -1,84 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("FIBER_SHAPES")] - public partial class FiberShape : ObservableEntity - { - - private String _name; - /// - /// Gets or sets the fibershape name. - /// - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private Int32 _code; - /// - /// Gets or sets the fibershape code. - /// - [Column("CODE")] - - public Int32 Code - { - get - { - return _code; - } - - set - { - _code = value; RaisePropertyChanged(nameof(Code)); - } - - } - - private ObservableCollection _rmls; - /// - /// Gets or sets the fibershape rmls. - /// - - public virtual ObservableCollection Rmls - { - get - { - return _rmls; - } - - set - { - _rmls = value; RaisePropertyChanged(nameof(Rmls)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public FiberShape() : base() - { - - Rmls = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/FiberSynth.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/FiberSynth.cs deleted file mode 100644 index 3b099b4de..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/FiberSynth.cs +++ /dev/null @@ -1,84 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("FIBER_SYNTHS")] - public partial class FiberSynth : ObservableEntity - { - - private String _name; - /// - /// Gets or sets the fibersynth name. - /// - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private Int32 _code; - /// - /// Gets or sets the fibersynth code. - /// - [Column("CODE")] - - public Int32 Code - { - get - { - return _code; - } - - set - { - _code = value; RaisePropertyChanged(nameof(Code)); - } - - } - - private ObservableCollection _rmls; - /// - /// Gets or sets the fibersynth rmls. - /// - - public virtual ObservableCollection Rmls - { - get - { - return _rmls; - } - - set - { - _rmls = value; RaisePropertyChanged(nameof(Rmls)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public FiberSynth() : base() - { - - Rmls = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/HardwareVersion.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/HardwareVersion.cs deleted file mode 100644 index bddc684d3..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/HardwareVersion.cs +++ /dev/null @@ -1,84 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("HARDWARE_VERSIONS")] - public partial class HardwareVersion : ObservableEntity - { - - private Double _version; - /// - /// Gets or sets the hardwareversion version. - /// - [Column("VERSION")] - - public Double Version - { - get - { - return _version; - } - - set - { - _version = value; RaisePropertyChanged(nameof(Version)); - } - - } - - private String _name; - /// - /// Gets or sets the hardwareversion name. - /// - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private ObservableCollection _configurations; - /// - /// Gets or sets the hardwareversion configurations. - /// - - public virtual ObservableCollection Configurations - { - get - { - return _configurations; - } - - set - { - _configurations = value; RaisePropertyChanged(nameof(Configurations)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public HardwareVersion() : base() - { - - Configurations = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/IdsPack.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/IdsPack.cs deleted file mode 100644 index e3a48c422..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/IdsPack.cs +++ /dev/null @@ -1,296 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("IDS_PACKS")] - public partial class IdsPack : ObservableEntity - { - - private String _configurationguid; - /// - /// Gets or sets the idspack configuration guid. - /// - [Column("CONFIGURATION_GUID")] - [ForeignKey("Configuration")] - public String ConfigurationGuid - { - get - { - return _configurationguid; - } - - set - { - _configurationguid = value; RaisePropertyChanged(nameof(ConfigurationGuid)); - } - - } - - private String _dispensertypeguid; - /// - /// Gets or sets the idspack dispenser type guid. - /// - [Column("DISPENSER_TYPE_GUID")] - [ForeignKey("DispenserType")] - public String DispenserTypeGuid - { - get - { - return _dispensertypeguid; - } - - set - { - _dispensertypeguid = value; RaisePropertyChanged(nameof(DispenserTypeGuid)); - } - - } - - private String _liquidtypeguid; - /// - /// Gets or sets the idspack liquid type guid. - /// - [Column("LIQUID_TYPE_GUID")] - [ForeignKey("LiquidType")] - public String LiquidTypeGuid - { - get - { - return _liquidtypeguid; - } - - set - { - _liquidtypeguid = value; RaisePropertyChanged(nameof(LiquidTypeGuid)); - } - - } - - private String _cartridgetypeguid; - /// - /// Gets or sets the idspack cartridge type guid. - /// - [Column("CARTRIDGE_TYPE_GUID")] - [ForeignKey("CartridgeType")] - public String CartridgeTypeGuid - { - get - { - return _cartridgetypeguid; - } - - set - { - _cartridgetypeguid = value; RaisePropertyChanged(nameof(CartridgeTypeGuid)); - } - - } - - private String _midtanktypeguid; - /// - /// Gets or sets the idspack mid tank type guid. - /// - [Column("MID_TANK_TYPE_GUID")] - [ForeignKey("MidTankType")] - public String MidTankTypeGuid - { - get - { - return _midtanktypeguid; - } - - set - { - _midtanktypeguid = value; RaisePropertyChanged(nameof(MidTankTypeGuid)); - } - - } - - private String _name; - /// - /// Gets or sets the idspack name. - /// - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private Int32 _packindex; - /// - /// Gets or sets the idspack pack index. - /// - [Column("PACK_INDEX")] - - public Int32 PackIndex - { - get - { - return _packindex; - } - - set - { - _packindex = value; RaisePropertyChanged(nameof(PackIndex)); - } - - } - - private String _idspackformulaguid; - /// - /// Gets or sets the idspack ids pack formula guid. - /// - [Column("IDS_PACK_FORMULA_GUID")] - [ForeignKey("IdsPackFormula")] - public String IdsPackFormulaGuid - { - get - { - return _idspackformulaguid; - } - - set - { - _idspackformulaguid = value; RaisePropertyChanged(nameof(IdsPackFormulaGuid)); - } - - } - - private CartridgeType _cartridgetype; - /// - /// Gets or sets the idspack cartridge types. - /// - - public virtual CartridgeType CartridgeType - { - get - { - return _cartridgetype; - } - - set - { - _cartridgetype = value; RaisePropertyChanged(nameof(CartridgeType)); - } - - } - - private Configuration _configuration; - /// - /// Gets or sets the idspack configuration. - /// - - public virtual Configuration Configuration - { - get - { - return _configuration; - } - - set - { - _configuration = value; RaisePropertyChanged(nameof(Configuration)); - } - - } - - private DispenserType _dispensertype; - /// - /// Gets or sets the idspack dispenser types. - /// - - public virtual DispenserType DispenserType - { - get - { - return _dispensertype; - } - - set - { - _dispensertype = value; RaisePropertyChanged(nameof(DispenserType)); - } - - } - - private IdsPackFormula _idspackformula; - /// - /// Gets or sets the idspack ids pack formulas. - /// - - public virtual IdsPackFormula IdsPackFormula - { - get - { - return _idspackformula; - } - - set - { - _idspackformula = value; RaisePropertyChanged(nameof(IdsPackFormula)); - } - - } - - private LiquidType _liquidtype; - /// - /// Gets or sets the idspack liquid types. - /// - - public virtual LiquidType LiquidType - { - get - { - return _liquidtype; - } - - set - { - _liquidtype = value; RaisePropertyChanged(nameof(LiquidType)); - } - - } - - private MidTankType _midtanktype; - /// - /// Gets or sets the idspack mid tank types. - /// - - public virtual MidTankType MidTankType - { - get - { - return _midtanktype; - } - - set - { - _midtanktype = value; RaisePropertyChanged(nameof(MidTankType)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public IdsPack() : base() - { - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/IdsPackFormula.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/IdsPackFormula.cs deleted file mode 100644 index 0ad754233..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/IdsPackFormula.cs +++ /dev/null @@ -1,124 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("IDS_PACK_FORMULAS")] - public partial class IdsPackFormula : ObservableEntity - { - - private Int32 _code; - /// - /// Gets or sets the idspackformula code. - /// - [Column("CODE")] - - public Int32 Code - { - get - { - return _code; - } - - set - { - _code = value; RaisePropertyChanged(nameof(Code)); - } - - } - - private String _name; - /// - /// Gets or sets the idspackformula name. - /// - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private String _description; - /// - /// Gets or sets the idspackformula description. - /// - [Column("DESCRIPTION")] - - public String Description - { - get - { - return _description; - } - - set - { - _description = value; RaisePropertyChanged(nameof(Description)); - } - - } - - private Boolean _autocalculated; - /// - /// Gets or sets the idspackformula auto calculated. - /// - [Column("AUTO_CALCULATED")] - - public Boolean AutoCalculated - { - get - { - return _autocalculated; - } - - set - { - _autocalculated = value; RaisePropertyChanged(nameof(AutoCalculated)); - } - - } - - private ObservableCollection _idspacks; - /// - /// Gets or sets the idspackformula ids packs. - /// - - public virtual ObservableCollection IdsPacks - { - get - { - return _idspacks; - } - - set - { - _idspacks = value; RaisePropertyChanged(nameof(IdsPacks)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public IdsPackFormula() : base() - { - - IdsPacks = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Job.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Job.cs deleted file mode 100644 index 37c8e6736..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Job.cs +++ /dev/null @@ -1,302 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("JOBS")] - public partial class Job : ObservableEntity - { - - private DateTime _creationdate; - /// - /// Gets or sets the job creation date. - /// - [Column("CREATION_DATE")] - - public DateTime CreationDate - { - get - { - return _creationdate; - } - - set - { - _creationdate = value; RaisePropertyChanged(nameof(CreationDate)); - } - - } - - private String _machineguid; - /// - /// Gets or sets the job machine guid. - /// - [Column("MACHINE_GUID")] - [ForeignKey("Machine")] - public String MachineGuid - { - get - { - return _machineguid; - } - - set - { - _machineguid = value; RaisePropertyChanged(nameof(MachineGuid)); - } - - } - - private String _rmlguid; - /// - /// Gets or sets the job rml guid. - /// - [Column("RML_GUID")] - [ForeignKey("Rml")] - public String RmlGuid - { - get - { - return _rmlguid; - } - - set - { - _rmlguid = value; RaisePropertyChanged(nameof(RmlGuid)); - } - - } - - private String _windingmethodguid; - /// - /// Gets or sets the job winding method guid. - /// - [Column("WINDING_METHOD_GUID")] - [ForeignKey("WindingMethod")] - public String WindingMethodGuid - { - get - { - return _windingmethodguid; - } - - set - { - _windingmethodguid = value; RaisePropertyChanged(nameof(WindingMethodGuid)); - } - - } - - private String _name; - /// - /// Gets or sets the job name. - /// - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private String _description; - /// - /// Gets or sets the job description. - /// - [Column("DESCRIPTION")] - - public String Description - { - get - { - return _description; - } - - set - { - _description = value; RaisePropertyChanged(nameof(Description)); - } - - } - - private Double _intersegmentlength; - /// - /// Gets or sets the job inter segment length. - /// - [Column("INTER_SEGMENT_LENGTH")] - - public Double InterSegmentLength - { - get - { - return _intersegmentlength; - } - - set - { - _intersegmentlength = value; RaisePropertyChanged(nameof(InterSegmentLength)); - } - - } - - private Boolean _enableintersegment; - /// - /// Gets or sets the job enable inter segment. - /// - [Column("ENABLE_INTER_SEGMENT")] - - public Boolean EnableInterSegment - { - get - { - return _enableintersegment; - } - - set - { - _enableintersegment = value; RaisePropertyChanged(nameof(EnableInterSegment)); - } - - } - - private Boolean _enablelubrication; - /// - /// Gets or sets the job enable lubrication. - /// - [Column("ENABLE_LUBRICATION")] - - public Boolean EnableLubrication - { - get - { - return _enablelubrication; - } - - set - { - _enablelubrication = value; RaisePropertyChanged(nameof(EnableLubrication)); - } - - } - - private ObservableCollection _jobruns; - /// - /// Gets or sets the job job runs. - /// - - public virtual ObservableCollection JobRuns - { - get - { - return _jobruns; - } - - set - { - _jobruns = value; RaisePropertyChanged(nameof(JobRuns)); - } - - } - - private Machine _machine; - /// - /// Gets or sets the job machine. - /// - - public virtual Machine Machine - { - get - { - return _machine; - } - - set - { - _machine = value; RaisePropertyChanged(nameof(Machine)); - } - - } - - private Rml _rml; - /// - /// Gets or sets the job rml. - /// - - public virtual Rml Rml - { - get - { - return _rml; - } - - set - { - _rml = value; RaisePropertyChanged(nameof(Rml)); - } - - } - - private WindingMethod _windingmethod; - /// - /// Gets or sets the job winding methods. - /// - - public virtual WindingMethod WindingMethod - { - get - { - return _windingmethod; - } - - set - { - _windingmethod = value; RaisePropertyChanged(nameof(WindingMethod)); - } - - } - - private ObservableCollection _segments; - /// - /// Gets or sets the job segments. - /// - - public virtual ObservableCollection Segments - { - get - { - return _segments; - } - - set - { - _segments = value; RaisePropertyChanged(nameof(Segments)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public Job() : base() - { - - JobRuns = new ObservableCollection(); - - Segments = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/JobRun.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/JobRun.cs deleted file mode 100644 index b15ca1511..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/JobRun.cs +++ /dev/null @@ -1,121 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("JOB_RUNS")] - public partial class JobRun : ObservableEntity - { - - private String _jobguid; - /// - /// Gets or sets the jobrun job guid. - /// - [Column("JOB_GUID")] - [ForeignKey("Job")] - public String JobGuid - { - get - { - return _jobguid; - } - - set - { - _jobguid = value; RaisePropertyChanged(nameof(JobGuid)); - } - - } - - private DateTime _startdate; - /// - /// Gets or sets the jobrun start date. - /// - [Column("START_DATE")] - - public DateTime StartDate - { - get - { - return _startdate; - } - - set - { - _startdate = value; RaisePropertyChanged(nameof(StartDate)); - } - - } - - private DateTime _enddate; - /// - /// Gets or sets the jobrun end date. - /// - [Column("END_DATE")] - - public DateTime EndDate - { - get - { - return _enddate; - } - - set - { - _enddate = value; RaisePropertyChanged(nameof(EndDate)); - } - - } - - private Boolean _successful; - /// - /// Gets or sets the jobrun successful. - /// - [Column("SUCCESSFUL")] - - public Boolean Successful - { - get - { - return _successful; - } - - set - { - _successful = value; RaisePropertyChanged(nameof(Successful)); - } - - } - - private Job _job; - /// - /// Gets or sets the jobrun job. - /// - - public virtual Job Job - { - get - { - return _job; - } - - set - { - _job = value; RaisePropertyChanged(nameof(Job)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public JobRun() : base() - { - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/LinearMassDensityUnit.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/LinearMassDensityUnit.cs deleted file mode 100644 index d0740e583..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/LinearMassDensityUnit.cs +++ /dev/null @@ -1,84 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("LINEAR_MASS_DENSITY_UNITS")] - public partial class LinearMassDensityUnit : ObservableEntity - { - - private String _name; - /// - /// Gets or sets the linearmassdensityunit name. - /// - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private Int32 _code; - /// - /// Gets or sets the linearmassdensityunit code. - /// - [Column("CODE")] - - public Int32 Code - { - get - { - return _code; - } - - set - { - _code = value; RaisePropertyChanged(nameof(Code)); - } - - } - - private ObservableCollection _rmls; - /// - /// Gets or sets the linearmassdensityunit rmls. - /// - - public virtual ObservableCollection Rmls - { - get - { - return _rmls; - } - - set - { - _rmls = value; RaisePropertyChanged(nameof(Rmls)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public LinearMassDensityUnit() : base() - { - - Rmls = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/LiquidType.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/LiquidType.cs deleted file mode 100644 index a166d8ec4..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/LiquidType.cs +++ /dev/null @@ -1,166 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("LIQUID_TYPES")] - public partial class LiquidType : ObservableEntity - { - - private Int32 _code; - /// - /// Gets or sets the liquidtype code. - /// - [Column("CODE")] - - public Int32 Code - { - get - { - return _code; - } - - set - { - _code = value; RaisePropertyChanged(nameof(Code)); - } - - } - - private String _name; - /// - /// Gets or sets the liquidtype name. - /// - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private Double _version; - /// - /// Gets or sets the liquidtype version. - /// - [Column("VERSION")] - - public Double Version - { - get - { - return _version; - } - - set - { - _version = value; RaisePropertyChanged(nameof(Version)); - } - - } - - private Int32 _color; - /// - /// Gets or sets the liquidtype color. - /// - [Column("COLOR")] - - public Int32 Color - { - get - { - return _color; - } - - set - { - _color = value; RaisePropertyChanged(nameof(Color)); - } - - } - - private ObservableCollection _cats; - /// - /// Gets or sets the liquidtype cats. - /// - - public virtual ObservableCollection Cats - { - get - { - return _cats; - } - - set - { - _cats = value; RaisePropertyChanged(nameof(Cats)); - } - - } - - private ObservableCollection _idspacks; - /// - /// Gets or sets the liquidtype ids packs. - /// - - public virtual ObservableCollection IdsPacks - { - get - { - return _idspacks; - } - - set - { - _idspacks = value; RaisePropertyChanged(nameof(IdsPacks)); - } - - } - - private ObservableCollection _liquidtypesrmls; - /// - /// Gets or sets the liquidtype liquid types rmls. - /// - - public virtual ObservableCollection LiquidTypesRmls - { - get - { - return _liquidtypesrmls; - } - - set - { - _liquidtypesrmls = value; RaisePropertyChanged(nameof(LiquidTypesRmls)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public LiquidType() : base() - { - - Cats = new ObservableCollection(); - - IdsPacks = new ObservableCollection(); - - LiquidTypesRmls = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/LiquidTypesRml.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/LiquidTypesRml.cs deleted file mode 100644 index 3f8fb6bad..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/LiquidTypesRml.cs +++ /dev/null @@ -1,120 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("LIQUID_TYPES_RMLS")] - public partial class LiquidTypesRml : ObservableEntity - { - - private String _liquidtypeguid; - /// - /// Gets or sets the liquidtypesrml liquid type guid. - /// - [Column("LIQUID_TYPE_GUID")] - [ForeignKey("LiquidType")] - public String LiquidTypeGuid - { - get - { - return _liquidtypeguid; - } - - set - { - _liquidtypeguid = value; RaisePropertyChanged(nameof(LiquidTypeGuid)); - } - - } - - private String _rmlguid; - /// - /// Gets or sets the liquidtypesrml rml guid. - /// - [Column("RML_GUID")] - [ForeignKey("Rml")] - public String RmlGuid - { - get - { - return _rmlguid; - } - - set - { - _rmlguid = value; RaisePropertyChanged(nameof(RmlGuid)); - } - - } - - private Double _maxnlpercm; - /// - /// Gets or sets the liquidtypesrml max nl per cm. - /// - [Column("MAX_NL_PER_CM")] - - public Double MaxNlPerCm - { - get - { - return _maxnlpercm; - } - - set - { - _maxnlpercm = value; RaisePropertyChanged(nameof(MaxNlPerCm)); - } - - } - - private LiquidType _liquidtype; - /// - /// Gets or sets the liquidtypesrml liquid types. - /// - - public virtual LiquidType LiquidType - { - get - { - return _liquidtype; - } - - set - { - _liquidtype = value; RaisePropertyChanged(nameof(LiquidType)); - } - - } - - private Rml _rml; - /// - /// Gets or sets the liquidtypesrml rml. - /// - - public virtual Rml Rml - { - get - { - return _rml; - } - - set - { - _rml = value; RaisePropertyChanged(nameof(Rml)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public LiquidTypesRml() : base() - { - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Machine.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Machine.cs deleted file mode 100644 index 3b41da138..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Machine.cs +++ /dev/null @@ -1,263 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("MACHINES")] - public partial class Machine : ObservableEntity - { - - private String _serialnumber; - /// - /// Gets or sets the machine serial number. - /// - [Column("SERIAL_NUMBER")] - - public String SerialNumber - { - get - { - return _serialnumber; - } - - set - { - _serialnumber = value; RaisePropertyChanged(nameof(SerialNumber)); - } - - } - - private String _name; - /// - /// Gets or sets the machine name. - /// - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private DateTime _productiondate; - /// - /// Gets or sets the machine production date. - /// - [Column("PRODUCTION_DATE")] - - public DateTime ProductionDate - { - get - { - return _productiondate; - } - - set - { - _productiondate = value; RaisePropertyChanged(nameof(ProductionDate)); - } - - } - - private String _organizationguid; - /// - /// Gets or sets the machine organization guid. - /// - [Column("ORGANIZATION_GUID")] - [ForeignKey("Organization")] - public String OrganizationGuid - { - get - { - return _organizationguid; - } - - set - { - _organizationguid = value; RaisePropertyChanged(nameof(OrganizationGuid)); - } - - } - - private String _machineversionguid; - /// - /// Gets or sets the machine machine version guid. - /// - [Column("MACHINE_VERSION_GUID")] - [ForeignKey("MachineVersion")] - public String MachineVersionGuid - { - get - { - return _machineversionguid; - } - - set - { - _machineversionguid = value; RaisePropertyChanged(nameof(MachineVersionGuid)); - } - - } - - private String _configurationguid; - /// - /// Gets or sets the machine configuration guid. - /// - [Column("CONFIGURATION_GUID")] - [ForeignKey("Configuration")] - public String ConfigurationGuid - { - get - { - return _configurationguid; - } - - set - { - _configurationguid = value; RaisePropertyChanged(nameof(ConfigurationGuid)); - } - - } - - private Configuration _configuration; - /// - /// Gets or sets the machine configuration. - /// - - public virtual Configuration Configuration - { - get - { - return _configuration; - } - - set - { - _configuration = value; RaisePropertyChanged(nameof(Configuration)); - } - - } - - private ObservableCollection _jobs; - /// - /// Gets or sets the machine jobs. - /// - - public virtual ObservableCollection Jobs - { - get - { - return _jobs; - } - - set - { - _jobs = value; RaisePropertyChanged(nameof(Jobs)); - } - - } - - private MachineVersion _machineversion; - /// - /// Gets or sets the machine machine versions. - /// - - public virtual MachineVersion MachineVersion - { - get - { - return _machineversion; - } - - set - { - _machineversion = value; RaisePropertyChanged(nameof(MachineVersion)); - } - - } - - private ObservableCollection _machinesconfigurations; - /// - /// Gets or sets the machine machines configurations. - /// - - public virtual ObservableCollection MachinesConfigurations - { - get - { - return _machinesconfigurations; - } - - set - { - _machinesconfigurations = value; RaisePropertyChanged(nameof(MachinesConfigurations)); - } - - } - - private ObservableCollection _machinesevents; - /// - /// Gets or sets the machine machines events. - /// - - public virtual ObservableCollection MachinesEvents - { - get - { - return _machinesevents; - } - - set - { - _machinesevents = value; RaisePropertyChanged(nameof(MachinesEvents)); - } - - } - - private Organization _organization; - /// - /// Gets or sets the machine organization. - /// - - public virtual Organization Organization - { - get - { - return _organization; - } - - set - { - _organization = value; RaisePropertyChanged(nameof(Organization)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public Machine() : base() - { - - Jobs = new ObservableCollection(); - - MachinesConfigurations = new ObservableCollection(); - - MachinesEvents = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/MachineVersion.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/MachineVersion.cs deleted file mode 100644 index a47ee4232..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/MachineVersion.cs +++ /dev/null @@ -1,123 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("MACHINE_VERSIONS")] - public partial class MachineVersion : ObservableEntity - { - - private Double _version; - /// - /// Gets or sets the machineversion version. - /// - [Column("VERSION")] - - public Double Version - { - get - { - return _version; - } - - set - { - _version = value; RaisePropertyChanged(nameof(Version)); - } - - } - - private String _name; - /// - /// Gets or sets the machineversion name. - /// - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private String _defaultconfigurationguid; - /// - /// Gets or sets the machineversion default configuration guid. - /// - [Column("DEFAULT_CONFIGURATION_GUID")] - [ForeignKey("DefaultConfiguration")] - public String DefaultConfigurationGuid - { - get - { - return _defaultconfigurationguid; - } - - set - { - _defaultconfigurationguid = value; RaisePropertyChanged(nameof(DefaultConfigurationGuid)); - } - - } - - private Configuration _defaultconfiguration; - /// - /// Gets or sets the machineversion configuration. - /// - - public virtual Configuration DefaultConfiguration - { - get - { - return _defaultconfiguration; - } - - set - { - _defaultconfiguration = value; RaisePropertyChanged(nameof(DefaultConfiguration)); - } - - } - - private ObservableCollection _machines; - /// - /// Gets or sets the machineversion machines. - /// - - public virtual ObservableCollection Machines - { - get - { - return _machines; - } - - set - { - _machines = value; RaisePropertyChanged(nameof(Machines)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public MachineVersion() : base() - { - - Machines = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/MachinesConfiguration.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/MachinesConfiguration.cs deleted file mode 100644 index 4ecaa0ad4..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/MachinesConfiguration.cs +++ /dev/null @@ -1,100 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("MACHINES_CONFIGURATIONS")] - public partial class MachinesConfiguration : ObservableEntity - { - - private String _machineguid; - /// - /// Gets or sets the machinesconfiguration machine guid. - /// - [Column("MACHINE_GUID")] - [ForeignKey("Machine")] - public String MachineGuid - { - get - { - return _machineguid; - } - - set - { - _machineguid = value; RaisePropertyChanged(nameof(MachineGuid)); - } - - } - - private String _configurationguid; - /// - /// Gets or sets the machinesconfiguration configuration guid. - /// - [Column("CONFIGURATION_GUID")] - [ForeignKey("Configuration")] - public String ConfigurationGuid - { - get - { - return _configurationguid; - } - - set - { - _configurationguid = value; RaisePropertyChanged(nameof(ConfigurationGuid)); - } - - } - - private Configuration _configuration; - /// - /// Gets or sets the machinesconfiguration configuration. - /// - - public virtual Configuration Configuration - { - get - { - return _configuration; - } - - set - { - _configuration = value; RaisePropertyChanged(nameof(Configuration)); - } - - } - - private Machine _machine; - /// - /// Gets or sets the machinesconfiguration machine. - /// - - public virtual Machine Machine - { - get - { - return _machine; - } - - set - { - _machine = value; RaisePropertyChanged(nameof(Machine)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public MachinesConfiguration() : base() - { - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/MachinesEvent.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/MachinesEvent.cs deleted file mode 100644 index 28fac4bbe..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/MachinesEvent.cs +++ /dev/null @@ -1,179 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("MACHINES_EVENTS")] - public partial class MachinesEvent : ObservableEntity - { - - private String _machineguid; - /// - /// Gets or sets the machinesevent machine guid. - /// - [Column("MACHINE_GUID")] - [ForeignKey("Machine")] - public String MachineGuid - { - get - { - return _machineguid; - } - - set - { - _machineguid = value; RaisePropertyChanged(nameof(MachineGuid)); - } - - } - - private String _eventtypeguid; - /// - /// Gets or sets the machinesevent event type guid. - /// - [Column("EVENT_TYPE_GUID")] - [ForeignKey("EventType")] - public String EventTypeGuid - { - get - { - return _eventtypeguid; - } - - set - { - _eventtypeguid = value; RaisePropertyChanged(nameof(EventTypeGuid)); - } - - } - - private String _userguid; - /// - /// Gets or sets the machinesevent user guid. - /// - [Column("USER_GUID")] - [ForeignKey("User")] - public String UserGuid - { - get - { - return _userguid; - } - - set - { - _userguid = value; RaisePropertyChanged(nameof(UserGuid)); - } - - } - - private DateTime _datetime; - /// - /// Gets or sets the machinesevent date time. - /// - [Column("DATE_TIME")] - - public DateTime DateTime - { - get - { - return _datetime; - } - - set - { - _datetime = value; RaisePropertyChanged(nameof(DateTime)); - } - - } - - private String _description; - /// - /// Gets or sets the machinesevent description. - /// - [Column("DESCRIPTION")] - - public String Description - { - get - { - return _description; - } - - set - { - _description = value; RaisePropertyChanged(nameof(Description)); - } - - } - - private EventType _eventtype; - /// - /// Gets or sets the machinesevent event types. - /// - - public virtual EventType EventType - { - get - { - return _eventtype; - } - - set - { - _eventtype = value; RaisePropertyChanged(nameof(EventType)); - } - - } - - private Machine _machine; - /// - /// Gets or sets the machinesevent machine. - /// - - public virtual Machine Machine - { - get - { - return _machine; - } - - set - { - _machine = value; RaisePropertyChanged(nameof(Machine)); - } - - } - - private User _user; - /// - /// Gets or sets the machinesevent user. - /// - - public virtual User User - { - get - { - return _user; - } - - set - { - _user = value; RaisePropertyChanged(nameof(User)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public MachinesEvent() : base() - { - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/MediaColor.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/MediaColor.cs deleted file mode 100644 index 158edebc5..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/MediaColor.cs +++ /dev/null @@ -1,64 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("MEDIA_COLORS")] - public partial class MediaColor : ObservableEntity - { - - private Int32 _color; - /// - /// Gets or sets the mediacolor color. - /// - [Column("COLOR")] - - public Int32 Color - { - get - { - return _color; - } - - set - { - _color = value; RaisePropertyChanged(nameof(Color)); - } - - } - - private ObservableCollection _rmls; - /// - /// Gets or sets the mediacolor rmls. - /// - - public virtual ObservableCollection Rmls - { - get - { - return _rmls; - } - - set - { - _rmls = value; RaisePropertyChanged(nameof(Rmls)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public MediaColor() : base() - { - - Rmls = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/MediaCondition.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/MediaCondition.cs deleted file mode 100644 index 105e046f5..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/MediaCondition.cs +++ /dev/null @@ -1,84 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("MEDIA_CONDITIONS")] - public partial class MediaCondition : ObservableEntity - { - - private String _name; - /// - /// Gets or sets the mediacondition name. - /// - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private Int32 _code; - /// - /// Gets or sets the mediacondition code. - /// - [Column("CODE")] - - public Int32 Code - { - get - { - return _code; - } - - set - { - _code = value; RaisePropertyChanged(nameof(Code)); - } - - } - - private ObservableCollection _rmls; - /// - /// Gets or sets the mediacondition rmls. - /// - - public virtual ObservableCollection Rmls - { - get - { - return _rmls; - } - - set - { - _rmls = value; RaisePropertyChanged(nameof(Rmls)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public MediaCondition() : base() - { - - Rmls = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/MediaMaterial.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/MediaMaterial.cs deleted file mode 100644 index f03d2c7a1..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/MediaMaterial.cs +++ /dev/null @@ -1,84 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("MEDIA_MATERIALS")] - public partial class MediaMaterial : ObservableEntity - { - - private String _name; - /// - /// Gets or sets the mediamaterial name. - /// - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private Int32 _code; - /// - /// Gets or sets the mediamaterial code. - /// - [Column("CODE")] - - public Int32 Code - { - get - { - return _code; - } - - set - { - _code = value; RaisePropertyChanged(nameof(Code)); - } - - } - - private ObservableCollection _rmls; - /// - /// Gets or sets the mediamaterial rmls. - /// - - public virtual ObservableCollection Rmls - { - get - { - return _rmls; - } - - set - { - _rmls = value; RaisePropertyChanged(nameof(Rmls)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public MediaMaterial() : base() - { - - Rmls = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/MediaPurpos.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/MediaPurpos.cs deleted file mode 100644 index a09bdd1b8..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/MediaPurpos.cs +++ /dev/null @@ -1,84 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("MEDIA_PURPOSES")] - public partial class MediaPurpos : ObservableEntity - { - - private String _name; - /// - /// Gets or sets the mediapurpos name. - /// - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private Int32 _code; - /// - /// Gets or sets the mediapurpos code. - /// - [Column("CODE")] - - public Int32 Code - { - get - { - return _code; - } - - set - { - _code = value; RaisePropertyChanged(nameof(Code)); - } - - } - - private ObservableCollection _rmls; - /// - /// Gets or sets the mediapurpos rmls. - /// - - public virtual ObservableCollection Rmls - { - get - { - return _rmls; - } - - set - { - _rmls = value; RaisePropertyChanged(nameof(Rmls)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public MediaPurpos() : base() - { - - Rmls = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/MidTankType.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/MidTankType.cs deleted file mode 100644 index 5fef06004..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/MidTankType.cs +++ /dev/null @@ -1,104 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("MID_TANK_TYPES")] - public partial class MidTankType : ObservableEntity - { - - private Int32 _code; - /// - /// Gets or sets the midtanktype code. - /// - [Column("CODE")] - - public Int32 Code - { - get - { - return _code; - } - - set - { - _code = value; RaisePropertyChanged(nameof(Code)); - } - - } - - private String _name; - /// - /// Gets or sets the midtanktype name. - /// - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private Double _litercapacity; - /// - /// Gets or sets the midtanktype liter capacity. - /// - [Column("LITER_CAPACITY")] - - public Double LiterCapacity - { - get - { - return _litercapacity; - } - - set - { - _litercapacity = value; RaisePropertyChanged(nameof(LiterCapacity)); - } - - } - - private ObservableCollection _idspacks; - /// - /// Gets or sets the midtanktype ids packs. - /// - - public virtual ObservableCollection IdsPacks - { - get - { - return _idspacks; - } - - set - { - _idspacks = value; RaisePropertyChanged(nameof(IdsPacks)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public MidTankType() : base() - { - - IdsPacks = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Organization.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Organization.cs deleted file mode 100644 index 28ea5f835..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Organization.cs +++ /dev/null @@ -1,163 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("ORGANIZATIONS")] - public partial class Organization : ObservableEntity - { - - private String _name; - /// - /// Gets or sets the organization name. - /// - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private String _contactguid; - /// - /// Gets or sets the organization contact guid. - /// - [Column("CONTACT_GUID")] - [ForeignKey("Contact")] - public String ContactGuid - { - get - { - return _contactguid; - } - - set - { - _contactguid = value; RaisePropertyChanged(nameof(ContactGuid)); - } - - } - - private String _addressguid; - /// - /// Gets or sets the organization address guid. - /// - [Column("ADDRESS_GUID")] - [ForeignKey("Address")] - public String AddressGuid - { - get - { - return _addressguid; - } - - set - { - _addressguid = value; RaisePropertyChanged(nameof(AddressGuid)); - } - - } - - private Address _address; - /// - /// Gets or sets the organization address. - /// - - public virtual Address Address - { - get - { - return _address; - } - - set - { - _address = value; RaisePropertyChanged(nameof(Address)); - } - - } - - private Contact _contact; - /// - /// Gets or sets the organization contact. - /// - - public virtual Contact Contact - { - get - { - return _contact; - } - - set - { - _contact = value; RaisePropertyChanged(nameof(Contact)); - } - - } - - private ObservableCollection _machines; - /// - /// Gets or sets the organization machines. - /// - - public virtual ObservableCollection Machines - { - get - { - return _machines; - } - - set - { - _machines = value; RaisePropertyChanged(nameof(Machines)); - } - - } - - private ObservableCollection _users; - /// - /// Gets or sets the organization users. - /// - - public virtual ObservableCollection Users - { - get - { - return _users; - } - - set - { - _users = value; RaisePropertyChanged(nameof(Users)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public Organization() : base() - { - - Machines = new ObservableCollection(); - - Users = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Permission.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Permission.cs deleted file mode 100644 index 9057ecbd5..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Permission.cs +++ /dev/null @@ -1,104 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("PERMISSIONS")] - public partial class Permission : ObservableEntity - { - - private Int32 _code; - /// - /// Gets or sets the permission code. - /// - [Column("CODE")] - - public Int32 Code - { - get - { - return _code; - } - - set - { - _code = value; RaisePropertyChanged(nameof(Code)); - } - - } - - private String _name; - /// - /// Gets or sets the permission name. - /// - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private String _description; - /// - /// Gets or sets the permission description. - /// - [Column("DESCRIPTION")] - - public String Description - { - get - { - return _description; - } - - set - { - _description = value; RaisePropertyChanged(nameof(Description)); - } - - } - - private ObservableCollection _rolespermissions; - /// - /// Gets or sets the permission roles permissions. - /// - - public virtual ObservableCollection RolesPermissions - { - get - { - return _rolespermissions; - } - - set - { - _rolespermissions = value; RaisePropertyChanged(nameof(RolesPermissions)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public Permission() : base() - { - - RolesPermissions = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/ProcessParametersTable.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/ProcessParametersTable.cs deleted file mode 100644 index 163d3da53..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/ProcessParametersTable.cs +++ /dev/null @@ -1,401 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("PROCESS_PARAMETERS_TABLES")] - public partial class ProcessParametersTable : ObservableEntity - { - - private String _name; - /// - /// Gets or sets the processparameterstable name. - /// - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private Double _dyeingspeed; - /// - /// Gets or sets the processparameterstable dyeing speed. - /// - [Column("DYEING_SPEED")] - - public Double DyeingSpeed - { - get - { - return _dyeingspeed; - } - - set - { - _dyeingspeed = value; RaisePropertyChanged(nameof(DyeingSpeed)); - } - - } - - private Double _mininkuptake; - /// - /// Gets or sets the processparameterstable min ink uptake. - /// - [Column("MIN_INK_UPTAKE")] - - public Double MinInkUptake - { - get - { - return _mininkuptake; - } - - set - { - _mininkuptake = value; RaisePropertyChanged(nameof(MinInkUptake)); - } - - } - - private Double _mixertemp; - /// - /// Gets or sets the processparameterstable mixer temp. - /// - [Column("MIXER_TEMP")] - - public Double MixerTemp - { - get - { - return _mixertemp; - } - - set - { - _mixertemp = value; RaisePropertyChanged(nameof(MixerTemp)); - } - - } - - private Double _headzone1temp; - /// - /// Gets or sets the processparameterstable head zone1 temp. - /// - [Column("HEAD_ZONE1_TEMP")] - - public Double HeadZone1Temp - { - get - { - return _headzone1temp; - } - - set - { - _headzone1temp = value; RaisePropertyChanged(nameof(HeadZone1Temp)); - } - - } - - private Double _headzone2temp; - /// - /// Gets or sets the processparameterstable head zone2 temp. - /// - [Column("HEAD_ZONE2_TEMP")] - - public Double HeadZone2Temp - { - get - { - return _headzone2temp; - } - - set - { - _headzone2temp = value; RaisePropertyChanged(nameof(HeadZone2Temp)); - } - - } - - private Double _headzone3temp; - /// - /// Gets or sets the processparameterstable head zone3 temp. - /// - [Column("HEAD_ZONE3_TEMP")] - - public Double HeadZone3Temp - { - get - { - return _headzone3temp; - } - - set - { - _headzone3temp = value; RaisePropertyChanged(nameof(HeadZone3Temp)); - } - - } - - private Double _headairflow; - /// - /// Gets or sets the processparameterstable head air flow. - /// - [Column("HEAD_AIR_FLOW")] - - public Double HeadAirFlow - { - get - { - return _headairflow; - } - - set - { - _headairflow = value; RaisePropertyChanged(nameof(HeadAirFlow)); - } - - } - - private Double _feedertension; - /// - /// Gets or sets the processparameterstable feeder tension. - /// - [Column("FEEDER_TENSION")] - - public Double FeederTension - { - get - { - return _feedertension; - } - - set - { - _feedertension = value; RaisePropertyChanged(nameof(FeederTension)); - } - - } - - private Double _pullertension; - /// - /// Gets or sets the processparameterstable puller tension. - /// - [Column("PULLER_TENSION")] - - public Double PullerTension - { - get - { - return _pullertension; - } - - set - { - _pullertension = value; RaisePropertyChanged(nameof(PullerTension)); - } - - } - - private Double _dryerbufferlength; - /// - /// Gets or sets the processparameterstable dryer buffer length. - /// - [Column("DRYER_BUFFER_LENGTH")] - - public Double DryerBufferLength - { - get - { - return _dryerbufferlength; - } - - set - { - _dryerbufferlength = value; RaisePropertyChanged(nameof(DryerBufferLength)); - } - - } - - private Double _dryerzone1temp; - /// - /// Gets or sets the processparameterstable dryer zone1 temp. - /// - [Column("DRYER_ZONE1_TEMP")] - - public Double DryerZone1Temp - { - get - { - return _dryerzone1temp; - } - - set - { - _dryerzone1temp = value; RaisePropertyChanged(nameof(DryerZone1Temp)); - } - - } - - private Double _dryerzone2temp; - /// - /// Gets or sets the processparameterstable dryer zone2 temp. - /// - [Column("DRYER_ZONE2_TEMP")] - - public Double DryerZone2Temp - { - get - { - return _dryerzone2temp; - } - - set - { - _dryerzone2temp = value; RaisePropertyChanged(nameof(DryerZone2Temp)); - } - - } - - private Double _dryerzone3temp; - /// - /// Gets or sets the processparameterstable dryer zone3 temp. - /// - [Column("DRYER_ZONE3_TEMP")] - - public Double DryerZone3Temp - { - get - { - return _dryerzone3temp; - } - - set - { - _dryerzone3temp = value; RaisePropertyChanged(nameof(DryerZone3Temp)); - } - - } - - private Double _dryerairflow; - /// - /// Gets or sets the processparameterstable dryer air flow. - /// - [Column("DRYER_AIR_FLOW")] - - public Double DryerAirFlow - { - get - { - return _dryerairflow; - } - - set - { - _dryerairflow = value; RaisePropertyChanged(nameof(DryerAirFlow)); - } - - } - - private Double _windertension; - /// - /// Gets or sets the processparameterstable winder tension. - /// - [Column("WINDER_TENSION")] - - public Double WinderTension - { - get - { - return _windertension; - } - - set - { - _windertension = value; RaisePropertyChanged(nameof(WinderTension)); - } - - } - - private String _processparameterstablesgroupguid; - /// - /// Gets or sets the processparameterstable process parameters tables group guid. - /// - [Column("PROCESS_PARAMETERS_TABLES_GROUP_GUID")] - [ForeignKey("ProcessParametersTablesGroup")] - public String ProcessParametersTablesGroupGuid - { - get - { - return _processparameterstablesgroupguid; - } - - set - { - _processparameterstablesgroupguid = value; RaisePropertyChanged(nameof(ProcessParametersTablesGroupGuid)); - } - - } - - private Int32 _tableindex; - /// - /// Gets or sets the processparameterstable table index. - /// - [Column("TABLE_INDEX")] - - public Int32 TableIndex - { - get - { - return _tableindex; - } - - set - { - _tableindex = value; RaisePropertyChanged(nameof(TableIndex)); - } - - } - - private ProcessParametersTablesGroup _processparameterstablesgroup; - /// - /// Gets or sets the processparameterstable process parameters tables groups. - /// - - public virtual ProcessParametersTablesGroup ProcessParametersTablesGroup - { - get - { - return _processparameterstablesgroup; - } - - set - { - _processparameterstablesgroup = value; RaisePropertyChanged(nameof(ProcessParametersTablesGroup)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public ProcessParametersTable() : base() - { - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/ProcessParametersTablesGroup.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/ProcessParametersTablesGroup.cs deleted file mode 100644 index ab8ae2ed8..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/ProcessParametersTablesGroup.cs +++ /dev/null @@ -1,143 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("PROCESS_PARAMETERS_TABLES_GROUPS")] - public partial class ProcessParametersTablesGroup : ObservableEntity - { - - private String _rmlguid; - /// - /// Gets or sets the processparameterstablesgroup rml guid. - /// - [Column("RML_GUID")] - [ForeignKey("Rml")] - public String RmlGuid - { - get - { - return _rmlguid; - } - - set - { - _rmlguid = value; RaisePropertyChanged(nameof(RmlGuid)); - } - - } - - private String _name; - /// - /// Gets or sets the processparameterstablesgroup name. - /// - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private Boolean _active; - /// - /// Gets or sets the processparameterstablesgroup active. - /// - [Column("ACTIVE")] - - public Boolean Active - { - get - { - return _active; - } - - set - { - _active = value; RaisePropertyChanged(nameof(Active)); - } - - } - - private DateTime _savedate; - /// - /// Gets or sets the processparameterstablesgroup save date. - /// - [Column("SAVE_DATE")] - - public DateTime SaveDate - { - get - { - return _savedate; - } - - set - { - _savedate = value; RaisePropertyChanged(nameof(SaveDate)); - } - - } - - private ObservableCollection _processparameterstables; - /// - /// Gets or sets the processparameterstablesgroup process parameters tables. - /// - - public virtual ObservableCollection ProcessParametersTables - { - get - { - return _processparameterstables; - } - - set - { - _processparameterstables = value; RaisePropertyChanged(nameof(ProcessParametersTables)); - } - - } - - private Rml _rml; - /// - /// Gets or sets the processparameterstablesgroup rml. - /// - - public virtual Rml Rml - { - get - { - return _rml; - } - - set - { - _rml = value; RaisePropertyChanged(nameof(Rml)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public ProcessParametersTablesGroup() : base() - { - - ProcessParametersTables = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Rml.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Rml.cs deleted file mode 100644 index 429773e0c..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Rml.cs +++ /dev/null @@ -1,661 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("RMLS")] - public partial class Rml : ObservableEntity - { - - private String _name; - /// - /// Gets or sets the rml name. - /// - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private String _manufacturer; - /// - /// Gets or sets the rml manufacturer. - /// - [Column("MANUFACTURER")] - - public String Manufacturer - { - get - { - return _manufacturer; - } - - set - { - _manufacturer = value; RaisePropertyChanged(nameof(Manufacturer)); - } - - } - - private Int32 _code; - /// - /// Gets or sets the rml code. - /// - [Column("CODE")] - - public Int32 Code - { - get - { - return _code; - } - - set - { - _code = value; RaisePropertyChanged(nameof(Code)); - } - - } - - private String _mediamaterialguid; - /// - /// Gets or sets the rml media material guid. - /// - [Column("MEDIA_MATERIAL_GUID")] - [ForeignKey("MediaMaterial")] - public String MediaMaterialGuid - { - get - { - return _mediamaterialguid; - } - - set - { - _mediamaterialguid = value; RaisePropertyChanged(nameof(MediaMaterialGuid)); - } - - } - - private String _mediacolorguid; - /// - /// Gets or sets the rml media color guid. - /// - [Column("MEDIA_COLOR_GUID")] - [ForeignKey("MediaColor")] - public String MediaColorGuid - { - get - { - return _mediacolorguid; - } - - set - { - _mediacolorguid = value; RaisePropertyChanged(nameof(MediaColorGuid)); - } - - } - - private String _mediapurposeguid; - /// - /// Gets or sets the rml media purpose guid. - /// - [Column("MEDIA_PURPOSE_GUID")] - [ForeignKey("MediaPurpose")] - public String MediaPurposeGuid - { - get - { - return _mediapurposeguid; - } - - set - { - _mediapurposeguid = value; RaisePropertyChanged(nameof(MediaPurposeGuid)); - } - - } - - private String _mediaconditionguid; - /// - /// Gets or sets the rml media condition guid. - /// - [Column("MEDIA_CONDITION_GUID")] - [ForeignKey("MediaCondition")] - public String MediaConditionGuid - { - get - { - return _mediaconditionguid; - } - - set - { - _mediaconditionguid = value; RaisePropertyChanged(nameof(MediaConditionGuid)); - } - - } - - private String _linearmassdensityunitguid; - /// - /// Gets or sets the rml linear mass density unit guid. - /// - [Column("LINEAR_MASS_DENSITY_UNIT_GUID")] - [ForeignKey("LinearMassDensityUnit")] - public String LinearMassDensityUnitGuid - { - get - { - return _linearmassdensityunitguid; - } - - set - { - _linearmassdensityunitguid = value; RaisePropertyChanged(nameof(LinearMassDensityUnitGuid)); - } - - } - - private String _fibershapeguid; - /// - /// Gets or sets the rml fiber shape guid. - /// - [Column("FIBER_SHAPE_GUID")] - [ForeignKey("FiberShape")] - public String FiberShapeGuid - { - get - { - return _fibershapeguid; - } - - set - { - _fibershapeguid = value; RaisePropertyChanged(nameof(FiberShapeGuid)); - } - - } - - private String _fibersynthguid; - /// - /// Gets or sets the rml fiber synth guid. - /// - [Column("FIBER_SYNTH_GUID")] - [ForeignKey("FiberSynth")] - public String FiberSynthGuid - { - get - { - return _fibersynthguid; - } - - set - { - _fibersynthguid = value; RaisePropertyChanged(nameof(FiberSynthGuid)); - } - - } - - private Double _fibersize; - /// - /// Gets or sets the rml fiber size. - /// - [Column("FIBER_SIZE")] - - public Double FiberSize - { - get - { - return _fibersize; - } - - set - { - _fibersize = value; RaisePropertyChanged(nameof(FiberSize)); - } - - } - - private Int32 _numberoffibers; - /// - /// Gets or sets the rml number of fibers. - /// - [Column("NUMBER_OF_FIBERS")] - - public Int32 NumberOfFibers - { - get - { - return _numberoffibers; - } - - set - { - _numberoffibers = value; RaisePropertyChanged(nameof(NumberOfFibers)); - } - - } - - private Int32 _pliesperfiber; - /// - /// Gets or sets the rml plies per fiber. - /// - [Column("PLIES_PER_FIBER")] - - public Int32 PliesPerFiber - { - get - { - return _pliesperfiber; - } - - set - { - _pliesperfiber = value; RaisePropertyChanged(nameof(PliesPerFiber)); - } - - } - - private Int32 _pliesperthread; - /// - /// Gets or sets the rml plies per thread. - /// - [Column("PLIES_PER_THREAD")] - - public Int32 PliesPerThread - { - get - { - return _pliesperthread; - } - - set - { - _pliesperthread = value; RaisePropertyChanged(nameof(PliesPerThread)); - } - - } - - private Boolean _twisted; - /// - /// Gets or sets the rml twisted. - /// - [Column("TWISTED")] - - public Boolean Twisted - { - get - { - return _twisted; - } - - set - { - _twisted = value; RaisePropertyChanged(nameof(Twisted)); - } - - } - - private Boolean _airentanglement; - /// - /// Gets or sets the rml air entanglement. - /// - [Column("AIR_ENTANGLEMENT")] - - public Boolean AirEntanglement - { - get - { - return _airentanglement; - } - - set - { - _airentanglement = value; RaisePropertyChanged(nameof(AirEntanglement)); - } - - } - - private Boolean _lubricant; - /// - /// Gets or sets the rml lubricant. - /// - [Column("LUBRICANT")] - - public Boolean Lubricant - { - get - { - return _lubricant; - } - - set - { - _lubricant = value; RaisePropertyChanged(nameof(Lubricant)); - } - - } - - private Double _tensilestrength; - /// - /// Gets or sets the rml tensile strength. - /// - [Column("TENSILE_STRENGTH")] - - public Double TensileStrength - { - get - { - return _tensilestrength; - } - - set - { - _tensilestrength = value; RaisePropertyChanged(nameof(TensileStrength)); - } - - } - - private Double _elongationatbreakpercentage; - /// - /// Gets or sets the rml elongation at break percentage. - /// - [Column("ELONGATION_AT_BREAK_PERCENTAGE")] - - public Double ElongationAtBreakPercentage - { - get - { - return _elongationatbreakpercentage; - } - - set - { - _elongationatbreakpercentage = value; RaisePropertyChanged(nameof(ElongationAtBreakPercentage)); - } - - } - - private Double _estimatedthreaddiameter; - /// - /// Gets or sets the rml estimated thread diameter. - /// - [Column("ESTIMATED_THREAD_DIAMETER")] - - public Double EstimatedThreadDiameter - { - get - { - return _estimatedthreaddiameter; - } - - set - { - _estimatedthreaddiameter = value; RaisePropertyChanged(nameof(EstimatedThreadDiameter)); - } - - } - - private ObservableCollection _cats; - /// - /// Gets or sets the rml cats. - /// - - public virtual ObservableCollection Cats - { - get - { - return _cats; - } - - set - { - _cats = value; RaisePropertyChanged(nameof(Cats)); - } - - } - - private ObservableCollection _ccts; - /// - /// Gets or sets the rml ccts. - /// - - public virtual ObservableCollection Ccts - { - get - { - return _ccts; - } - - set - { - _ccts = value; RaisePropertyChanged(nameof(Ccts)); - } - - } - - private FiberShape _fibershape; - /// - /// Gets or sets the rml fiber shapes. - /// - - public virtual FiberShape FiberShape - { - get - { - return _fibershape; - } - - set - { - _fibershape = value; RaisePropertyChanged(nameof(FiberShape)); - } - - } - - private FiberSynth _fibersynth; - /// - /// Gets or sets the rml fiber synths. - /// - - public virtual FiberSynth FiberSynth - { - get - { - return _fibersynth; - } - - set - { - _fibersynth = value; RaisePropertyChanged(nameof(FiberSynth)); - } - - } - - private ObservableCollection _jobs; - /// - /// Gets or sets the rml jobs. - /// - - public virtual ObservableCollection Jobs - { - get - { - return _jobs; - } - - set - { - _jobs = value; RaisePropertyChanged(nameof(Jobs)); - } - - } - - private LinearMassDensityUnit _linearmassdensityunit; - /// - /// Gets or sets the rml linear mass density units. - /// - - public virtual LinearMassDensityUnit LinearMassDensityUnit - { - get - { - return _linearmassdensityunit; - } - - set - { - _linearmassdensityunit = value; RaisePropertyChanged(nameof(LinearMassDensityUnit)); - } - - } - - private ObservableCollection _liquidtypesrmls; - /// - /// Gets or sets the rml liquid types rmls. - /// - - public virtual ObservableCollection LiquidTypesRmls - { - get - { - return _liquidtypesrmls; - } - - set - { - _liquidtypesrmls = value; RaisePropertyChanged(nameof(LiquidTypesRmls)); - } - - } - - private MediaColor _mediacolor; - /// - /// Gets or sets the rml media colors. - /// - - public virtual MediaColor MediaColor - { - get - { - return _mediacolor; - } - - set - { - _mediacolor = value; RaisePropertyChanged(nameof(MediaColor)); - } - - } - - private MediaCondition _mediacondition; - /// - /// Gets or sets the rml media conditions. - /// - - public virtual MediaCondition MediaCondition - { - get - { - return _mediacondition; - } - - set - { - _mediacondition = value; RaisePropertyChanged(nameof(MediaCondition)); - } - - } - - private MediaMaterial _mediamaterial; - /// - /// Gets or sets the rml media materials. - /// - - public virtual MediaMaterial MediaMaterial - { - get - { - return _mediamaterial; - } - - set - { - _mediamaterial = value; RaisePropertyChanged(nameof(MediaMaterial)); - } - - } - - private MediaPurpos _mediapurpose; - /// - /// Gets or sets the rml media purposes. - /// - - public virtual MediaPurpos MediaPurpose - { - get - { - return _mediapurpose; - } - - set - { - _mediapurpose = value; RaisePropertyChanged(nameof(MediaPurpose)); - } - - } - - private ObservableCollection _processparameterstablesgroups; - /// - /// Gets or sets the rml process parameters tables groups. - /// - - public virtual ObservableCollection ProcessParametersTablesGroups - { - get - { - return _processparameterstablesgroups; - } - - set - { - _processparameterstablesgroups = value; RaisePropertyChanged(nameof(ProcessParametersTablesGroups)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public Rml() : base() - { - - Cats = new ObservableCollection(); - - Ccts = new ObservableCollection(); - - Jobs = new ObservableCollection(); - - LiquidTypesRmls = new ObservableCollection(); - - ProcessParametersTablesGroups = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Role.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Role.cs deleted file mode 100644 index b9bb8244c..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Role.cs +++ /dev/null @@ -1,125 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("ROLES")] - public partial class Role : ObservableEntity - { - - private Int32 _code; - /// - /// Gets or sets the role code. - /// - [Column("CODE")] - - public Int32 Code - { - get - { - return _code; - } - - set - { - _code = value; RaisePropertyChanged(nameof(Code)); - } - - } - - private String _name; - /// - /// Gets or sets the role name. - /// - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private String _description; - /// - /// Gets or sets the role description. - /// - [Column("DESCRIPTION")] - - public String Description - { - get - { - return _description; - } - - set - { - _description = value; RaisePropertyChanged(nameof(Description)); - } - - } - - private ObservableCollection _rolespermissions; - /// - /// Gets or sets the role roles permissions. - /// - - public virtual ObservableCollection RolesPermissions - { - get - { - return _rolespermissions; - } - - set - { - _rolespermissions = value; RaisePropertyChanged(nameof(RolesPermissions)); - } - - } - - private ObservableCollection _usersroles; - /// - /// Gets or sets the role users roles. - /// - - public virtual ObservableCollection UsersRoles - { - get - { - return _usersroles; - } - - set - { - _usersroles = value; RaisePropertyChanged(nameof(UsersRoles)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public Role() : base() - { - - RolesPermissions = new ObservableCollection(); - - UsersRoles = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/RolesPermission.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/RolesPermission.cs deleted file mode 100644 index 3c7d4eb19..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/RolesPermission.cs +++ /dev/null @@ -1,100 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("ROLES_PERMISSIONS")] - public partial class RolesPermission : ObservableEntity - { - - private String _roleguid; - /// - /// Gets or sets the rolespermission role guid. - /// - [Column("ROLE_GUID")] - [ForeignKey("Role")] - public String RoleGuid - { - get - { - return _roleguid; - } - - set - { - _roleguid = value; RaisePropertyChanged(nameof(RoleGuid)); - } - - } - - private String _permissionguid; - /// - /// Gets or sets the rolespermission permission guid. - /// - [Column("PERMISSION_GUID")] - [ForeignKey("Permission")] - public String PermissionGuid - { - get - { - return _permissionguid; - } - - set - { - _permissionguid = value; RaisePropertyChanged(nameof(PermissionGuid)); - } - - } - - private Permission _permission; - /// - /// Gets or sets the rolespermission permission. - /// - - public virtual Permission Permission - { - get - { - return _permission; - } - - set - { - _permission = value; RaisePropertyChanged(nameof(Permission)); - } - - } - - private Role _role; - /// - /// Gets or sets the rolespermission role. - /// - - public virtual Role Role - { - get - { - return _role; - } - - set - { - _role = value; RaisePropertyChanged(nameof(Role)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public RolesPermission() : base() - { - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Segment.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Segment.cs deleted file mode 100644 index b018f2934..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Segment.cs +++ /dev/null @@ -1,123 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("SEGMENTS")] - public partial class Segment : ObservableEntity - { - - private String _name; - /// - /// Gets or sets the segment name. - /// - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private String _jobguid; - /// - /// Gets or sets the segment job guid. - /// - [Column("JOB_GUID")] - [ForeignKey("Job")] - public String JobGuid - { - get - { - return _jobguid; - } - - set - { - _jobguid = value; RaisePropertyChanged(nameof(JobGuid)); - } - - } - - private Double _length; - /// - /// Gets or sets the segment length. - /// - [Column("LENGTH")] - - public Double Length - { - get - { - return _length; - } - - set - { - _length = value; RaisePropertyChanged(nameof(Length)); - } - - } - - private ObservableCollection _brushstops; - /// - /// Gets or sets the segment brush stops. - /// - - public virtual ObservableCollection BrushStops - { - get - { - return _brushstops; - } - - set - { - _brushstops = value; RaisePropertyChanged(nameof(BrushStops)); - } - - } - - private Job _job; - /// - /// Gets or sets the segment job. - /// - - public virtual Job Job - { - get - { - return _job; - } - - set - { - _job = value; RaisePropertyChanged(nameof(Job)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public Segment() : base() - { - - BrushStops = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Sensor.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Sensor.cs deleted file mode 100644 index 6b581f086..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Sensor.cs +++ /dev/null @@ -1,202 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("SENSORS")] - public partial class Sensor : ObservableEntity - { - - private Int32 _code; - /// - /// Gets or sets the sensor code. - /// - [Column("CODE")] - - public Int32 Code - { - get - { - return _code; - } - - set - { - _code = value; RaisePropertyChanged(nameof(Code)); - } - - } - - private String _name; - /// - /// Gets or sets the sensor name. - /// - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private String _description; - /// - /// Gets or sets the sensor description. - /// - [Column("DESCRIPTION")] - - public String Description - { - get - { - return _description; - } - - set - { - _description = value; RaisePropertyChanged(nameof(Description)); - } - - } - - private Double _min; - /// - /// Gets or sets the sensor min. - /// - [Column("MIN")] - - public Double Min - { - get - { - return _min; - } - - set - { - _min = value; RaisePropertyChanged(nameof(Min)); - } - - } - - private Double _max; - /// - /// Gets or sets the sensor max. - /// - [Column("MAX")] - - public Double Max - { - get - { - return _max; - } - - set - { - _max = value; RaisePropertyChanged(nameof(Max)); - } - - } - - private String _units; - /// - /// Gets or sets the sensor units. - /// - [Column("UNITS")] - - public String Units - { - get - { - return _units; - } - - set - { - _units = value; RaisePropertyChanged(nameof(Units)); - } - - } - - private Int32 _pointsperframe; - /// - /// Gets or sets the sensor points per frame. - /// - [Column("POINTS_PER_FRAME")] - - public Int32 PointsPerFrame - { - get - { - return _pointsperframe; - } - - set - { - _pointsperframe = value; RaisePropertyChanged(nameof(PointsPerFrame)); - } - - } - - private Boolean _multichannel; - /// - /// Gets or sets the sensor multi channel. - /// - [Column("MULTI_CHANNEL")] - - public Boolean MultiChannel - { - get - { - return _multichannel; - } - - set - { - _multichannel = value; RaisePropertyChanged(nameof(MultiChannel)); - } - - } - - private Int32 _channelcount; - /// - /// Gets or sets the sensor channel count. - /// - [Column("CHANNEL_COUNT")] - - public Int32 ChannelCount - { - get - { - return _channelcount; - } - - set - { - _channelcount = value; RaisePropertyChanged(nameof(ChannelCount)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public Sensor() : base() - { - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/SyncConfiguration.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/SyncConfiguration.cs deleted file mode 100644 index 595757139..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/SyncConfiguration.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("SYNC_CONFIGURATIONS")] - public partial class SyncConfiguration : ObservableEntity - { - - /// - /// Initializes a new instance of the class. - /// - public SyncConfiguration() : base() - { - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/User.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/User.cs deleted file mode 100644 index 1a73b3750..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/User.cs +++ /dev/null @@ -1,242 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("USERS")] - public partial class User : ObservableEntity - { - - private Boolean _deleted; - /// - /// Gets or sets the user deleted. - /// - [Column("DELETED")] - - public Boolean Deleted - { - get - { - return _deleted; - } - - set - { - _deleted = value; RaisePropertyChanged(nameof(Deleted)); - } - - } - - private String _email; - /// - /// Gets or sets the user email. - /// - [Column("EMAIL")] - - public String Email - { - get - { - return _email; - } - - set - { - _email = value; RaisePropertyChanged(nameof(Email)); - } - - } - - private String _password; - /// - /// Gets or sets the user password. - /// - [Column("PASSWORD")] - - public String Password - { - get - { - return _password; - } - - set - { - _password = value; RaisePropertyChanged(nameof(Password)); - } - - } - - private String _organizationguid; - /// - /// Gets or sets the user organization guid. - /// - [Column("ORGANIZATION_GUID")] - [ForeignKey("Organization")] - public String OrganizationGuid - { - get - { - return _organizationguid; - } - - set - { - _organizationguid = value; RaisePropertyChanged(nameof(OrganizationGuid)); - } - - } - - private String _contactguid; - /// - /// Gets or sets the user contact guid. - /// - [Column("CONTACT_GUID")] - [ForeignKey("Contact")] - public String ContactGuid - { - get - { - return _contactguid; - } - - set - { - _contactguid = value; RaisePropertyChanged(nameof(ContactGuid)); - } - - } - - private String _addressguid; - /// - /// Gets or sets the user address guid. - /// - [Column("ADDRESS_GUID")] - [ForeignKey("Address")] - public String AddressGuid - { - get - { - return _addressguid; - } - - set - { - _addressguid = value; RaisePropertyChanged(nameof(AddressGuid)); - } - - } - - private Address _address; - /// - /// Gets or sets the user address. - /// - - public virtual Address Address - { - get - { - return _address; - } - - set - { - _address = value; RaisePropertyChanged(nameof(Address)); - } - - } - - private Contact _contact; - /// - /// Gets or sets the user contact. - /// - - public virtual Contact Contact - { - get - { - return _contact; - } - - set - { - _contact = value; RaisePropertyChanged(nameof(Contact)); - } - - } - - private ObservableCollection _machinesevents; - /// - /// Gets or sets the user machines events. - /// - - public virtual ObservableCollection MachinesEvents - { - get - { - return _machinesevents; - } - - set - { - _machinesevents = value; RaisePropertyChanged(nameof(MachinesEvents)); - } - - } - - private Organization _organization; - /// - /// Gets or sets the user organization. - /// - - public virtual Organization Organization - { - get - { - return _organization; - } - - set - { - _organization = value; RaisePropertyChanged(nameof(Organization)); - } - - } - - private ObservableCollection _usersroles; - /// - /// Gets or sets the user users roles. - /// - - public virtual ObservableCollection UsersRoles - { - get - { - return _usersroles; - } - - set - { - _usersroles = value; RaisePropertyChanged(nameof(UsersRoles)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public User() : base() - { - - MachinesEvents = new ObservableCollection(); - - UsersRoles = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/UsersRole.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/UsersRole.cs deleted file mode 100644 index 934bb8822..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/UsersRole.cs +++ /dev/null @@ -1,120 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("USERS_ROLES")] - public partial class UsersRole : ObservableEntity - { - - private Boolean _deleted; - /// - /// Gets or sets the usersrole deleted. - /// - [Column("DELETED")] - - public Boolean Deleted - { - get - { - return _deleted; - } - - set - { - _deleted = value; RaisePropertyChanged(nameof(Deleted)); - } - - } - - private String _userguid; - /// - /// Gets or sets the usersrole user guid. - /// - [Column("USER_GUID")] - [ForeignKey("User")] - public String UserGuid - { - get - { - return _userguid; - } - - set - { - _userguid = value; RaisePropertyChanged(nameof(UserGuid)); - } - - } - - private String _roleguid; - /// - /// Gets or sets the usersrole role guid. - /// - [Column("ROLE_GUID")] - [ForeignKey("Role")] - public String RoleGuid - { - get - { - return _roleguid; - } - - set - { - _roleguid = value; RaisePropertyChanged(nameof(RoleGuid)); - } - - } - - private Role _role; - /// - /// Gets or sets the usersrole role. - /// - - public virtual Role Role - { - get - { - return _role; - } - - set - { - _role = value; RaisePropertyChanged(nameof(Role)); - } - - } - - private User _user; - /// - /// Gets or sets the usersrole user. - /// - - public virtual User User - { - get - { - return _user; - } - - set - { - _user = value; RaisePropertyChanged(nameof(User)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public UsersRole() : base() - { - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/WindingMethod.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/WindingMethod.cs deleted file mode 100644 index f14cf43cc..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/WindingMethod.cs +++ /dev/null @@ -1,104 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using Tango.DAL.Remote.DB; - -namespace Tango.DAL.Observables -{ - [Table("WINDING_METHODS")] - public partial class WindingMethod : ObservableEntity - { - - private Int32 _code; - /// - /// Gets or sets the windingmethod code. - /// - [Column("CODE")] - - public Int32 Code - { - get - { - return _code; - } - - set - { - _code = value; RaisePropertyChanged(nameof(Code)); - } - - } - - private String _name; - /// - /// Gets or sets the windingmethod name. - /// - [Column("NAME")] - - public String Name - { - get - { - return _name; - } - - set - { - _name = value; RaisePropertyChanged(nameof(Name)); - } - - } - - private String _description; - /// - /// Gets or sets the windingmethod description. - /// - [Column("DESCRIPTION")] - - public String Description - { - get - { - return _description; - } - - set - { - _description = value; RaisePropertyChanged(nameof(Description)); - } - - } - - private ObservableCollection _jobs; - /// - /// Gets or sets the windingmethod jobs. - /// - - public virtual ObservableCollection Jobs - { - get - { - return _jobs; - } - - set - { - _jobs = value; RaisePropertyChanged(nameof(Jobs)); - } - - } - - /// - /// Initializes a new instance of the class. - /// - public WindingMethod() : base() - { - - Jobs = new ObservableCollection(); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/EntityFieldNameAttribute.cs b/Software/Visual_Studio/Tango.DAL.Observables/EntityFieldNameAttribute.cs deleted file mode 100644 index ed3d8f720..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/EntityFieldNameAttribute.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.DAL.Observables -{ - /// - /// Represents an property attribute. - /// - /// - public class EntityFieldNameAttribute : Attribute - { - /// - /// Gets or sets the table column name. - /// - public String Name { get; set; } - - /// - /// Initializes a new instance of the class. - /// - /// The column name. - public EntityFieldNameAttribute(String name) - { - Name = name; - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/ActionTypes.cs b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/ActionTypes.cs deleted file mode 100644 index ef45931de..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/ActionTypes.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.ComponentModel; - -namespace Tango.DAL.Observables -{ - public enum ActionTypes - { - - /// - /// (Some description) - /// - [Description("Some description")] - Action1 = 1, - - /// - /// (Some action 2 description) - /// - [Description("Some action 2 description")] - Action2yesss = 2, - - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/Actions.cs b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/Actions.cs deleted file mode 100644 index 5723920b5..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/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.DAL.Observables -{ - public enum Actions - { - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/CartridgeTypes.cs b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/CartridgeTypes.cs deleted file mode 100644 index 35cc310c6..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/CartridgeTypes.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.ComponentModel; - -namespace Tango.DAL.Observables -{ - public enum CartridgeTypes - { - - /// - /// (Cartridge 1) - /// - [Description("Cartridge 1")] - Cartridge1 = 1, - - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/ColorSpaces.cs b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/ColorSpaces.cs deleted file mode 100644 index e2ba60dbe..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/ColorSpaces.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.ComponentModel; - -namespace Tango.DAL.Observables -{ - public enum ColorSpaces - { - - /// - /// (Volume) - /// - [Description("Volume")] - Volume = 0, - - /// - /// (RGB) - /// - [Description("RGB")] - RGB = 1, - - /// - /// (CMYK) - /// - [Description("CMYK")] - CMYK = 2, - - /// - /// (LAB) - /// - [Description("LAB")] - LAB = 3, - - /// - /// (PANTON) - /// - [Description("PANTON")] - PANTON = 4, - - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/DispenserTypes.cs b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/DispenserTypes.cs deleted file mode 100644 index bcd085dc4..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/DispenserTypes.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.ComponentModel; - -namespace Tango.DAL.Observables -{ - public enum DispenserTypes - { - - /// - /// (Dispenser 1) - /// - [Description("Dispenser 1")] - Dispenser1 = 1, - - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/EventTypes.cs b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/EventTypes.cs deleted file mode 100644 index 66df05539..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/EventTypes.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.ComponentModel; - -namespace Tango.DAL.Observables -{ - public enum EventTypes - { - - /// - /// (Some event description) - /// - [Description("Some event description")] - Event1 = 1, - - /// - /// (Some event 2 description) - /// - [Description("Some event 2 description")] - Event2 = 2, - - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/Events.cs b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/Events.cs deleted file mode 100644 index 63becf698..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/Events.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.DAL.Observables -{ - public enum Events - { - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/FiberShapes.cs b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/FiberShapes.cs deleted file mode 100644 index 9b32088fa..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/FiberShapes.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.ComponentModel; - -namespace Tango.DAL.Observables -{ - public enum FiberShapes - { - - /// - /// (Triangle) - /// - [Description("Triangle")] - Triangle = 1, - - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/FiberSynthes.cs b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/FiberSynthes.cs deleted file mode 100644 index 4bc13b83a..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/FiberSynthes.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.DAL.Observables -{ - public enum FiberSynthes - { - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/FiberSynthesises.cs b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/FiberSynthesises.cs deleted file mode 100644 index e66e5f3df..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/FiberSynthesises.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.DAL.Observables -{ - public enum FiberSynthesises - { - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/FiberSynths.cs b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/FiberSynths.cs deleted file mode 100644 index 66ef5b189..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/FiberSynths.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.ComponentModel; - -namespace Tango.DAL.Observables -{ - public enum FiberSynths - { - - /// - /// (Some syntheses type) - /// - [Description("Some syntheses type")] - Somesynthesestype = 1, - - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/IdsPackFormulas.cs b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/IdsPackFormulas.cs deleted file mode 100644 index 595cb176b..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/IdsPackFormulas.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.ComponentModel; - -namespace Tango.DAL.Observables -{ - public enum IdsPackFormulas - { - - /// - /// (Standard Color IDS Pack Formula) - /// - [Description("Standard Color IDS Pack Formula")] - StandardColor = 0, - - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/LinearMassDensityUnits.cs b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/LinearMassDensityUnits.cs deleted file mode 100644 index 6d2903333..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/LinearMassDensityUnits.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.ComponentModel; - -namespace Tango.DAL.Observables -{ - public enum LinearMassDensityUnits - { - - /// - /// (Dex) - /// - [Description("Dex")] - Dex = 1, - - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/LiquidTypes.cs b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/LiquidTypes.cs deleted file mode 100644 index bc2bf036b..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/LiquidTypes.cs +++ /dev/null @@ -1,55 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.ComponentModel; - -namespace Tango.DAL.Observables -{ - public enum LiquidTypes - { - - /// - /// (Cyan) - /// - [Description("Cyan")] - Cyan = 1, - - /// - /// (Red) - /// - [Description("Red")] - Red = 7, - - /// - /// (Transparent Ink) - /// - [Description("Transparent Ink")] - TransparentInk = 6, - - /// - /// (Magenta) - /// - [Description("Magenta")] - Magenta = 2, - - /// - /// (Lubricant) - /// - [Description("Lubricant")] - Lubricant = 5, - - /// - /// (Yellow) - /// - [Description("Yellow")] - Yellow = 2, - - /// - /// (Black) - /// - [Description("Black")] - Black = 4, - - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/Liquids.cs b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/Liquids.cs deleted file mode 100644 index 95cf098b1..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/Liquids.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.ComponentModel; - -namespace Tango.DAL.Observables -{ - public enum Liquids - { - - /// - /// (Cyan) - /// - [Description("Cyan")] - Cyan = 1, - - /// - /// (Magenta) - /// - [Description("Magenta")] - Magenta = 2, - - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/MediaConditions.cs b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/MediaConditions.cs deleted file mode 100644 index d961ef8a5..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/MediaConditions.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.ComponentModel; - -namespace Tango.DAL.Observables -{ - public enum MediaConditions - { - - /// - /// (Treated) - /// - [Description("Treated")] - Treated = 1, - - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/MediaMaterials.cs b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/MediaMaterials.cs deleted file mode 100644 index 552b43d55..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/MediaMaterials.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.ComponentModel; - -namespace Tango.DAL.Observables -{ - public enum MediaMaterials - { - - /// - /// (Nylon) - /// - [Description("Nylon")] - Nylon = 1, - - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/MediaPurposes.cs b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/MediaPurposes.cs deleted file mode 100644 index aae066631..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/MediaPurposes.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.ComponentModel; - -namespace Tango.DAL.Observables -{ - public enum MediaPurposes - { - - /// - /// (Embroidery) - /// - [Description("Embroidery")] - Embroidery = 1, - - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/MidTankTypes.cs b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/MidTankTypes.cs deleted file mode 100644 index a2571f577..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/MidTankTypes.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.ComponentModel; - -namespace Tango.DAL.Observables -{ - public enum MidTankTypes - { - - /// - /// (Liter Tank 2) - /// - [Description("Liter Tank 2")] - LiterTank2 = 1, - - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/Permissions.cs b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/Permissions.cs deleted file mode 100644 index e3ac70144..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/Permissions.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.ComponentModel; - -namespace Tango.DAL.Observables -{ - public enum Permissions - { - - /// - /// (Allows loading the technician module in Machine Studio) - /// - [Description("Allows loading the technician module in Machine Studio")] - RunTechnicianModule = 0, - - /// - /// (Allows loading the developer module in Machine Studio) - /// - [Description("Allows loading the developer module in Machine Studio")] - RunDeveloperModule = 1, - - /// - /// (Allows loading the database module in Machine Studio) - /// - [Description("Allows loading the database module in Machine Studio")] - RunDataBaseModule = 2, - - /// - /// (Allows loading the synchronization module in machine studio) - /// - [Description("Allows loading the synchronization module in machine studio")] - RunSynchronizationModule = 3, - - /// - /// (Allows loading the machine designer module in Machine Studio) - /// - [Description("Allows loading the machine designer module in Machine Studio")] - RunMachineDesignerModule = 4, - - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/Rmls.cs b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/Rmls.cs deleted file mode 100644 index 5f8bb5eef..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/Rmls.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.ComponentModel; - -namespace Tango.DAL.Observables -{ - public enum Rmls - { - - /// - /// (RML 2) - /// - [Description("RML 2")] - RML2 = 0, - - /// - /// (RML 1) - /// - [Description("RML 1")] - RML1 = 0, - - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/Roles.cs b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/Roles.cs deleted file mode 100644 index 6563e0826..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/Roles.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.ComponentModel; - -namespace Tango.DAL.Observables -{ - public enum Roles - { - - /// - /// (User with standard permissions) - /// - [Description("User with standard permissions")] - User = 0, - - /// - /// (Twine administrator) - /// - [Description("Twine administrator")] - Administrator = 1, - - /// - /// (Twine technician) - /// - [Description("Twine technician")] - Technician = 2, - - /// - /// (Twine Research and development) - /// - [Description("Twine Research and development")] - Developer = 3, - - /// - /// (Role Description) - /// - [Description("Role Description")] - SomeRole = 4, - - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/Sensors.cs b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/Sensors.cs deleted file mode 100644 index 906764c0f..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/Sensors.cs +++ /dev/null @@ -1,181 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.ComponentModel; - -namespace Tango.DAL.Observables -{ - public enum Sensors - { - - /// - /// (Dancer 1) - /// - [Description("Dancer 1")] - Dancer1Angle = 0, - - /// - /// (Dancer 2) - /// - [Description("Dancer 2")] - Dancer2Angle = 1, - - /// - /// (Dancer 3) - /// - [Description("Dancer 3")] - Dancer3Angle = 2, - - /// - /// (Feeder Motor) - /// - [Description("Feeder Motor")] - FeederMotorFrequency = 3, - - /// - /// (Dryer Motor) - /// - [Description("Dryer Motor")] - DryerMotor = 4, - - /// - /// (Poller Motor) - /// - [Description("Poller Motor")] - PollerMotor = 5, - - /// - /// (Winder Motor) - /// - [Description("Winder Motor")] - WinderMotor = 6, - - /// - /// (Screw Motor) - /// - [Description("Screw Motor")] - ScrewMotor = 7, - - /// - /// (Thread Speed) - /// - [Description("Thread Speed")] - ThreadSpeed = 8, - - /// - /// (Mixer) - /// - [Description("Mixer")] - MixerTemperature = 9, - - /// - /// (Head Zone 1) - /// - [Description("Head Zone 1")] - HeadZone1Temperature = 10, - - /// - /// (Head Zone 2) - /// - [Description("Head Zone 2")] - HeadZone2Temperature = 11, - - /// - /// (Head Zone 3) - /// - [Description("Head Zone 3")] - HeadZone3Temperature = 12, - - /// - /// (Head Air Flow) - /// - [Description("Head Air Flow")] - HeadAirFlow = 13, - - /// - /// (Feeder Tension) - /// - [Description("Feeder Tension")] - FeederTension = 14, - - /// - /// (Puller Tension) - /// - [Description("Puller Tension")] - PullerTension = 15, - - /// - /// (Dryer Zone 1) - /// - [Description("Dryer Zone 1")] - DryerZone1Temperature = 16, - - /// - /// (Dryer Zone 2) - /// - [Description("Dryer Zone 2")] - DryerZone2Temperature = 17, - - /// - /// (Dryer Zone 3) - /// - [Description("Dryer Zone 3")] - DryerZone3Temperature = 18, - - /// - /// (Dryer Air Flow) - /// - [Description("Dryer Air Flow")] - DryerAirFlow = 19, - - /// - /// (Winder Tension) - /// - [Description("Winder Tension")] - WinderTension = 20, - - /// - /// (Dispensers Motors) - /// - [Description("Dispensers Motors")] - DispensersMotorsFrequency = 21, - - /// - /// (Dispensers Angular Encoders) - /// - [Description("Dispensers Angular Encoders")] - DispensersAngularEncoders = 22, - - /// - /// (Dispensers Linear Positions) - /// - [Description("Dispensers Linear Positions")] - DispensersLinearPositions = 23, - - /// - /// (Dispensers Pressure) - /// - [Description("Dispensers Pressure")] - DispensersPressure = 24, - - /// - /// (Mid Tank Pressure) - /// - [Description("Mid Tank Pressure")] - MidTankPressure = 25, - - /// - /// (Filter Delta Pressure) - /// - [Description("Filter Delta Pressure")] - FilterDeltaPressure = 26, - - /// - /// (Chiller Temperature) - /// - [Description("Chiller Temperature")] - ChillerTemperature = 27, - - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/WindingMethods.cs b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/WindingMethods.cs deleted file mode 100644 index 95e6d5e6d..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/WindingMethods.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Linq; -using System.ComponentModel; - -namespace Tango.DAL.Observables -{ - public enum WindingMethods - { - - /// - /// (Embroidery Winding) - /// - [Description("Embroidery Winding")] - Embroidery = 0, - - /// - /// (Calibration Winding) - /// - [Description("Calibration Winding")] - Calibration = 1, - - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/ExtensionMethods.cs b/Software/Visual_Studio/Tango.DAL.Observables/ExtensionMethods.cs deleted file mode 100644 index 5911d7cfb..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/ExtensionMethods.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using System.Reflection; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.DAL.Observables -{ - /// - /// Contains DAL generation specific extension methods. - /// - public static class ExtensionMethods - { - /// - /// Gets the attribute value. - /// - /// - public static String GetDALName(this Type type) - { - return (type.GetCustomAttributes(typeof(TableAttribute), false).SingleOrDefault() as TableAttribute).Name; - } - - /// - /// Gets the attribute value. - /// - /// - public static String GetDALName(this PropertyInfo prop) - { - return (prop.GetCustomAttributes(typeof(TableAttribute), false).SingleOrDefault() as TableAttribute).Name; - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/ExtensionMethods/ConfigurationExtensions.cs b/Software/Visual_Studio/Tango.DAL.Observables/ExtensionMethods/ConfigurationExtensions.cs deleted file mode 100644 index ec6ab2f7f..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/ExtensionMethods/ConfigurationExtensions.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.DAL.Observables; - -/// -/// Contains extension methods. -/// -public static class ConfigurationExtensions -{ - /// - /// Clones the configuration along with it's IDS packs. - /// - /// The configuration. - /// - public static Configuration CloneConfiguration(this Configuration configuration) - { - Configuration cloned = configuration.CloneEntity(); - cloned.CreationDate = DateTime.UtcNow; - - foreach (var idsPack in configuration.IdsPacks) - { - IdsPack clonedPack = idsPack.CloneEntity(); - clonedPack.Configuration = cloned; - clonedPack.DispenserType = idsPack.DispenserType; - clonedPack.CartridgeType = idsPack.CartridgeType; - clonedPack.MidTankType = idsPack.MidTankType; - clonedPack.IdsPackFormula = idsPack.IdsPackFormula; - cloned.IdsPacks.Add(clonedPack); - } - - return cloned; - } -} - diff --git a/Software/Visual_Studio/Tango.DAL.Observables/ExtensionMethods/ObservableEntityExtensions.cs b/Software/Visual_Studio/Tango.DAL.Observables/ExtensionMethods/ObservableEntityExtensions.cs deleted file mode 100644 index 8bb305026..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/ExtensionMethods/ObservableEntityExtensions.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.DAL.Observables; - -/// -/// Contains extension methods. -/// -public static class ObservableEntityExtensions -{ - /// - /// Performs a shallow cloning of this entity. - /// - /// - /// The entity. - /// - public static T CloneEntity(this T entity) where T : class, IObservableEntity - { - T cloned = entity.ShallowClone(); - cloned.ID = 0; - cloned.Guid = Guid.NewGuid().ToString(); - cloned.LastUpdated = DateTime.UtcNow; - return cloned; - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/ExtensionMethods/ProcessParametersTablesGroupExtensions.cs b/Software/Visual_Studio/Tango.DAL.Observables/ExtensionMethods/ProcessParametersTablesGroupExtensions.cs deleted file mode 100644 index 853570512..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/ExtensionMethods/ProcessParametersTablesGroupExtensions.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.DAL.Observables; - -public static class ProcessParametersTablesGroupExtensions -{ - public static ProcessParametersTablesGroup CloneGroup(this ProcessParametersTablesGroup group) - { - ProcessParametersTablesGroup cloned = group.CloneEntity(); - - List tables = new List(); - foreach (var table in group.ProcessParametersTables) - { - var newTable = table.CloneEntity(); - newTable.ProcessParametersTablesGroup = cloned; - tables.Add(newTable); - } - - cloned.ProcessParametersTables = tables.ToObservableCollection(); - - return cloned; - } -} - diff --git a/Software/Visual_Studio/Tango.DAL.Observables/IObservableEntity.cs b/Software/Visual_Studio/Tango.DAL.Observables/IObservableEntity.cs deleted file mode 100644 index 9caa89223..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/IObservableEntity.cs +++ /dev/null @@ -1,79 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Data.Entity; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.Core; - -namespace Tango.DAL.Observables -{ - /// - /// Represents an observable database entity. - /// - public interface IObservableEntity : IParameterized - { - /// - /// Occurs after this observable has been saved. - /// - event EventHandler Saved; - - /// - /// Gets or sets the entity identifier. - /// - [Column("ID")] - [DatabaseGeneratedAttribute(DatabaseGeneratedOption.Identity)] - Int32 ID { get; set; } - - /// - /// Gets or sets the entity unique identifier. - /// - [Key] - [Column("GUID")] - String Guid { get; set; } - - /// - /// Gets or sets the entity last updated data and time. - /// - [Column("LAST_UPDATED")] - DateTime LastUpdated { get; set; } - - /// - /// Saves the changes on this entity to database. - /// - void Save(); - - /// - /// Attaches this observable to the proper DbSet. - /// - void Attach(); - - /// - /// Detaches this observable from the proper DbSet. - /// - void Detach(); - - /// - /// Saves the changes on this entity to database asynchronously. - /// - /// - Task SaveAsync(); - - /// - /// Deletes this entity from the database. - /// - void Delete(); - - /// - /// Deletes this entity without saving changes to data base. - /// - void DefferedDelete(); - - /// - /// Deletes this entity from the database. - /// - Task DeleteAsync(); - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/LoadedEntitiesService.cs b/Software/Visual_Studio/Tango.DAL.Observables/LoadedEntitiesService.cs deleted file mode 100644 index 6e36c417d..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/LoadedEntitiesService.cs +++ /dev/null @@ -1,65 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.DAL.Observables -{ - /// - /// Represents a service responsible for caching the collection all loaded observable entities. - /// - internal static class LoadedEntitiesService - { - private static List> LoadedObjects; //Holds the collection of cached entities. - - /// - /// Initializes the class. - /// - static LoadedEntitiesService() - { - LoadedObjects = new List>(); - - } - /// - /// Gets the loaded entity by the specified entity guid. - /// - /// The unique identifier. - /// - public static Object Get(String guid) - { - return LoadedObjects.SingleOrDefault(x => x.Key == guid).Value; - } - - /// - /// Adds the specified observable entity. - /// - /// The unique identifier. - /// The observable. - public static void Add(String guid, IObservableEntity observable) - { - if (!LoadedObjects.Exists(x => x.Key == guid)) - { - LoadedObjects.Add(new KeyValuePair(guid, observable)); - } - } - - /// - /// Determines whether the specified observable entity is loaded. - /// - /// The unique identifier. - /// - public static bool IsLoaded(String guid) - { - return LoadedObjects.Exists(x => x.Key == guid); - } - - /// - /// Resets the entities cache. - /// - public static void Reset() - { - LoadedObjects.Clear(); - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/ObservableEntity.cs b/Software/Visual_Studio/Tango.DAL.Observables/ObservableEntity.cs deleted file mode 100644 index 000642375..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/ObservableEntity.cs +++ /dev/null @@ -1,254 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Data.Entity; -using System.Globalization; -using System.Linq; -using System.Reflection; -using System.Text; -using System.Text.RegularExpressions; -using System.Threading.Tasks; -using Tango.Core; -using Tango.DAL.Remote.DB; -using Tango.DAL.Remote; -using Tango.Settings; -using Tango.Core.Helpers; -using Force.DeepCloner; -using System.ComponentModel.DataAnnotations.Schema; -using System.ComponentModel.DataAnnotations; -using System.Runtime.CompilerServices; - -namespace Tango.DAL.Observables -{ - /// - /// Represents a generic observable entity base class. - /// - /// - /// - /// - public abstract class ObservableEntity : ExtendedObject, IObservableEntity where T : class, IObservableEntity - { - private Regex regExDAL; - - /// - /// Occurs after this observable has been saved. - /// - public event EventHandler Saved; - - private Int32 _id; - /// - /// Gets or sets the entity identifier. - /// - [Column("ID")] - [DatabaseGeneratedAttribute(DatabaseGeneratedOption.Identity)] - public Int32 ID - { - get { return _id; } - set { _id = value; RaisePropertyChanged(nameof(ID)); } - } - - private String _guid; - /// - /// Gets or sets the entity unique identifier. - /// - [Key] - [Column("GUID")] - public String Guid - { - get { return _guid; } - set { _guid = value; RaisePropertyChanged(nameof(Guid)); } - } - - private DateTime _lastUpdated; - /// - /// Gets or sets the entity last updated data and time. - /// - [Column("LAST_UPDATED")] - public DateTime LastUpdated - { - get { return _lastUpdated; } - set { _lastUpdated = value; RaisePropertyChanged(nameof(LastUpdated)); } - } - - private ReadOnlyObservableCollection _parameters; - /// - /// Gets a bind-able observable collection of the component properties. - /// - [NotMapped] - public ReadOnlyObservableCollection Parameters - { - get { return _parameters; } - set { _parameters = value; RaisePropertyChangedAuto(); } - } - - /// - /// Initializes a new instance of the class. - /// - public ObservableEntity() - { - Guid = System.Guid.NewGuid().ToString(); - LastUpdated = DateTime.UtcNow; - regExDAL = new Regex(@" - (?<=[A-Z])(?=[A-Z][a-z]) | - (?<=[^A-Z])(?=[A-Z]) | - (?<=[A-Za-z])(?=[^A-Za-z])", RegexOptions.IgnorePatternWhitespace); - - if (!DesignMode) - { - ThreadsHelper.InvokeUI(() => - { - Parameters = new ReadOnlyObservableCollection(this.CreateParametersCollection(ParameterItemMode.Binding)); - }); - } - } - - /// - /// Saves the changes on this entity to database. - /// - public virtual void Save() - { - ObservablesEntitiesAdapter.Instance.SaveChanges(); - Saved?.Invoke(this, new EventArgs()); - } - - /// - /// Attaches this entity to the proper DbSet. - /// - public virtual void Attach() - { - GetDbSet().Add(this as T); - } - - /// - /// Detaches this observable from the proper DbSet. - /// - public virtual void Detach() - { - GetDbSet().Remove(this as T); - } - - /// - /// Saves the changes on this entity to database asynchronously. - /// - /// - public Task SaveAsync() - { - return Task.Factory.StartNew(() => - { - Save(); - }); - } - - /// - /// Deletes this entity from the database - /// - public virtual void Delete() - { - var delProp = this.GetType().GetProperty("Deleted"); - - if (delProp != null) - { - delProp.SetValue(this, true); - Save(); - } - else - { - GetDbSet().Remove(this as T); - Save(); - } - } - - /// - /// Deletes this entity without saving changes to data base. - /// - public virtual void DefferedDelete() - { - GetDbSet().Remove(this as T); - } - - /// - /// Deletes this entity from the database - /// - public Task DeleteAsync() - { - return Task.Factory.StartNew(() => - { - Delete(); - }); - } - - /// - /// Gets the observable database set. - /// - /// - public DbSet GetDbSet() - { - String tabelName = this.GetType().Name.PluralizeMVC(); - var p = typeof(ObservablesContext).GetProperty(tabelName); - if (p != null) - { - var set1 = p.GetValue(ObservablesEntitiesAdapter.Instance.Context) as DbSet; - return set1; - } - else - { - tabelName = this.GetType().BaseType.Name.PluralizeMVC(); - p = typeof(ObservablesContext).GetProperty(tabelName); - if (p != null) - { - var set2 = p.GetValue(ObservablesEntitiesAdapter.Instance.Context) as DbSet; - return set2; - } - } - - return null; - } - - #region Operator Overloading - - //public static bool operator ==(ObservableEntityBase observable1, ObservableEntityBase observable2) - //{ - // if (object.ReferenceEquals(observable1, null) || object.ReferenceEquals(observable2, null)) - // { - // return object.ReferenceEquals(observable1, observable2); - // } - - // return observable1.Guid.ToLower() == observable2.Guid.ToLower(); - //} - - //public static bool operator !=(ObservableEntityBase observable1, ObservableEntityBase observable2) - //{ - // if (object.ReferenceEquals(observable1, null) || object.ReferenceEquals(observable2, null)) - // { - // return !object.ReferenceEquals(observable1, observable2); - // } - - // return observable1.Guid.ToLower() != observable2.Guid.ToLower(); - //} - - //public override bool Equals(object obj) - //{ - // if (object.ReferenceEquals(this, null) || object.ReferenceEquals(obj, null)) - // { - // return object.ReferenceEquals(this, obj); - // } - - // if (obj is ObservableEntityBase) - // { - // return Guid.ToLower() == (obj as ObservableEntityBase).Guid.ToLower(); - // } - // else - // { - // return false; - // } - //} - - public override int GetHashCode() - { - return base.GetHashCode(); - } - - #endregion - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/ObservablesContext.cs b/Software/Visual_Studio/Tango.DAL.Observables/ObservablesContext.cs deleted file mode 100644 index 63dc901ba..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/ObservablesContext.cs +++ /dev/null @@ -1,451 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Data.Entity; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.Settings; - -namespace Tango.DAL.Observables -{ - public class ObservablesContext : DbContext - { - /// - /// Initializes a new instance of the class. - /// - /// The server file path. - /// if set to true will try to connect to an .mdf file. - public ObservablesContext(String path, bool isFile) : base(ComposeConnectionString(path, isFile)) - { - - } - - /// - /// Composes the connection string. - /// - /// The source. - /// if set to true [is file]. - /// - private static String ComposeConnectionString(String source, bool isFile) - { - if (!isFile) - { - return String.Format("Data Source={0};Initial Catalog=Tango;Integrated Security=true", source); - } - else - { - return null; - } - } - - /// - /// Creates a default remote database context by the address specified in . - /// - /// - public static ObservablesContext CreateDefault() - { - return new ObservablesContext(SettingsManager.Default.DataBase.SQLServerAddress, false); - } - - /// - /// Gets or sets the ActionTypes. - /// - public DbSet ActionTypes - { - get; set; - } - - /// - /// Gets or sets the Addresses. - /// - public DbSet
Addresses - { - get; set; - } - - /// - /// Gets or sets the ApplicationDisplayPanelVersions. - /// - public DbSet ApplicationDisplayPanelVersions - { - get; set; - } - - /// - /// Gets or sets the ApplicationFirmwareVersions. - /// - public DbSet ApplicationFirmwareVersions - { - get; set; - } - - /// - /// Gets or sets the ApplicationOsVersions. - /// - public DbSet ApplicationOsVersions - { - get; set; - } - - /// - /// Gets or sets the ApplicationVersions. - /// - public DbSet ApplicationVersions - { - get; set; - } - - /// - /// Gets or sets the BrushStops. - /// - public DbSet BrushStops - { - get; set; - } - - /// - /// Gets or sets the CartridgeTypes. - /// - public DbSet CartridgeTypes - { - get; set; - } - - /// - /// Gets or sets the Cats. - /// - public DbSet Cats - { - get; set; - } - - /// - /// Gets or sets the Ccts. - /// - public DbSet Ccts - { - get; set; - } - - /// - /// Gets or sets the ColorSpaces. - /// - public DbSet ColorSpaces - { - get; set; - } - - /// - /// Gets or sets the Configurations. - /// - public DbSet Configurations - { - get; set; - } - - /// - /// Gets or sets the Contacts. - /// - public DbSet Contacts - { - get; set; - } - - /// - /// Gets or sets the DispenserTypes. - /// - public DbSet DispenserTypes - { - get; set; - } - - /// - /// Gets or sets the EmbeddedFirmwareVersions. - /// - public DbSet EmbeddedFirmwareVersions - { - get; set; - } - - /// - /// Gets or sets the EmbeddedSoftwareVersions. - /// - public DbSet EmbeddedSoftwareVersions - { - get; set; - } - - /// - /// Gets or sets the EventTypes. - /// - public DbSet EventTypes - { - get; set; - } - - /// - /// Gets or sets the EventTypesActions. - /// - public DbSet EventTypesActions - { - get; set; - } - - /// - /// Gets or sets the FiberShapes. - /// - public DbSet FiberShapes - { - get; set; - } - - /// - /// Gets or sets the FiberSynths. - /// - public DbSet FiberSynths - { - get; set; - } - - /// - /// Gets or sets the HardwareVersions. - /// - public DbSet HardwareVersions - { - get; set; - } - - /// - /// Gets or sets the IdsPackFormulas. - /// - public DbSet IdsPackFormulas - { - get; set; - } - - /// - /// Gets or sets the IdsPacks. - /// - public DbSet IdsPacks - { - get; set; - } - - /// - /// Gets or sets the JobRuns. - /// - public DbSet JobRuns - { - get; set; - } - - /// - /// Gets or sets the Jobs. - /// - public DbSet Jobs - { - get; set; - } - - /// - /// Gets or sets the LinearMassDensityUnits. - /// - public DbSet LinearMassDensityUnits - { - get; set; - } - - /// - /// Gets or sets the LiquidTypes. - /// - public DbSet LiquidTypes - { - get; set; - } - - /// - /// Gets or sets the LiquidTypesRmls. - /// - public DbSet LiquidTypesRmls - { - get; set; - } - - /// - /// Gets or sets the MachineVersions. - /// - public DbSet MachineVersions - { - get; set; - } - - /// - /// Gets or sets the Machines. - /// - public DbSet Machines - { - get; set; - } - - /// - /// Gets or sets the MachinesConfigurations. - /// - public DbSet MachinesConfigurations - { - get; set; - } - - /// - /// Gets or sets the MachinesEvents. - /// - public DbSet MachinesEvents - { - get; set; - } - - /// - /// Gets or sets the MediaColors. - /// - public DbSet MediaColors - { - get; set; - } - - /// - /// Gets or sets the MediaConditions. - /// - public DbSet MediaConditions - { - get; set; - } - - /// - /// Gets or sets the MediaMaterials. - /// - public DbSet MediaMaterials - { - get; set; - } - - /// - /// Gets or sets the MediaPurposes. - /// - public DbSet MediaPurposes - { - get; set; - } - - /// - /// Gets or sets the MidTankTypes. - /// - public DbSet MidTankTypes - { - get; set; - } - - /// - /// Gets or sets the Organizations. - /// - public DbSet Organizations - { - get; set; - } - - /// - /// Gets or sets the Permissions. - /// - public DbSet Permissions - { - get; set; - } - - /// - /// Gets or sets the ProcessParametersTables. - /// - public DbSet ProcessParametersTables - { - get; set; - } - - /// - /// Gets or sets the ProcessParametersTablesGroups. - /// - public DbSet ProcessParametersTablesGroups - { - get; set; - } - - /// - /// Gets or sets the Rmls. - /// - public DbSet Rmls - { - get; set; - } - - /// - /// Gets or sets the Roles. - /// - public DbSet Roles - { - get; set; - } - - /// - /// Gets or sets the RolesPermissions. - /// - public DbSet RolesPermissions - { - get; set; - } - - /// - /// Gets or sets the Segments. - /// - public DbSet Segments - { - get; set; - } - - /// - /// Gets or sets the Sensors. - /// - public DbSet Sensors - { - get; set; - } - - /// - /// Gets or sets the SyncConfigurations. - /// - public DbSet SyncConfigurations - { - get; set; - } - - /// - /// Gets or sets the Users. - /// - public DbSet Users - { - get; set; - } - - /// - /// Gets or sets the UsersRoles. - /// - public DbSet UsersRoles - { - get; set; - } - - /// - /// Gets or sets the WindingMethods. - /// - public DbSet WindingMethods - { - get; set; - } - - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapter.cs b/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapter.cs deleted file mode 100644 index 4b0f8747d..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapter.cs +++ /dev/null @@ -1,300 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Data.Entity; -using System.Linq; -using System.Text; -using System.Threading; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Data; -using System.Windows.Threading; -using Tango.Core; -using Tango.DAL.Remote.DB; -using Tango.Settings; - -namespace Tango.DAL.Observables -{ - /// - /// Exposes method for retrieving observable collections of observable entities. - /// - /// - public partial class ObservablesEntitiesAdapter : ExtendedObject - { - public event Action Initialized; - - private static object _syncLock; - - private static ObservablesEntitiesAdapter _instance; - /// - /// Gets the singleton instance. - /// - public static ObservablesEntitiesAdapter Instance - { - get - { - if (_instance == null) - { - _instance = new ObservablesEntitiesAdapter(); - } - return _instance; - } - } - - /// - /// Gets the DB context. - /// - public ObservablesContext Context { get; private set; } - - /// - /// Performs an implicit conversion from to . - /// - /// The instance. - /// - /// The result of the conversion. - /// - public static implicit operator DbContext(ObservablesEntitiesAdapter instance) - { - return instance.Context; - } - - /// - /// Prevents a default instance of the class from being created. - /// - private ObservablesEntitiesAdapter() - { - Context = new ObservablesContext(SettingsManager.Default.DataBase.SQLServerAddress, false); - } - - /// - /// Initializes this instance. - /// - public void Initialize() - { - Invalidate(true); - Initialized?.Invoke(); - } - - /// - /// Saves the current changes to database. - /// - public void SaveChanges() - { - try - { - Context.SaveChanges(); - } - catch (Exception ex) - { - throw ex; - } - finally - { - Invalidate(); - } - } - - /// - /// Invokes the specified action on the adapter synchronization context. - /// - /// The action. - public void Invoke(Action action) - { - lock (_syncLock) - { - action(); - } - } - - /// - /// Invalidates the adapter and reloads the database. - /// - /// if set to true [initializing]. - public void Invalidate(bool initializing = false) - { - _syncLock = new object(); - - LoadedEntitiesService.Reset(); - - if (initializing) - { - //Remove Unlinked Configurations.. - List remove_configurations = new List(); - - foreach (var config in Context.Configurations) - { - if (Context.MachineVersions.FirstOrDefault(x => x.DefaultConfigurationGuid == config.Guid) != null) - { - continue; - } - - if (Context.MachinesConfigurations.FirstOrDefault(x => x.ConfigurationGuid == config.Guid) != null) - { - continue; - } - - if (Context.Machines.FirstOrDefault(x => x.ConfigurationGuid == config.Guid) != null) - { - continue; - } - - remove_configurations.Add(config); - } - - foreach (var config in remove_configurations) - { - Context.Configurations.Remove(config); - } - - Context.SaveChanges(); - //Remove Unlinked Configurations.. - } - - Organizations = Context.Organizations.ToObservableCollection(); - - Machines = Context.Machines.ToObservableCollection(); - - foreach (var machine in Machines) - { - machine.MachinesConfigurations = machine.MachinesConfigurations.OrderByDescending(x => x.Configuration.CreationDate).Take(30).ToObservableCollection(); - machine.Jobs = machine.Jobs.OrderByDescending(x => x.CreationDate).ToObservableCollection(); - } - - MachinesConfigurations = Context.MachinesConfigurations.ToObservableCollection(); - - MachineVersions = Context.MachineVersions.ToList().OrderBy(x => x.Version).ToObservableCollection(); - - Addresses = Context.Addresses.Where(x => !x.Deleted).ToList().OrderBy(x => x.AddressString).ToObservableCollection(); - Contacts = Context.Contacts.Where(x => !x.Deleted).ToList().OrderBy(x => x.FullName).ToObservableCollection(); - - Roles = Context.Roles.ToList().OrderBy(x => x.Name).ToObservableCollection(); - - Permissions = Context.Permissions.ToList().OrderBy(x => x.Name).ToObservableCollection(); - - UsersRoles = Context.UsersRoles.ToObservableCollection(); - - Users = Context.Users.Where(x => !x.Deleted).ToList().OrderBy(x => x.Contact.FullName).ToObservableCollection(); - - //foreach (var user in Users) - //{ - // user.UsersRoles = user.UsersRoles.Where(x => !x.Deleted).ToObservableCollection(); - //} - - foreach (var role in Roles) - { - role.RolesPermissions = role.RolesPermissions.ToObservableCollection(); - } - - Configurations = Context.Configurations.ToList().OrderBy(x => x.LastUpdated).ToObservableCollection(); - - foreach (var config in Configurations) - { - config.IdsPacks = config.IdsPacks.ToObservableCollection(); - } - - ApplicationVersions = Context.ApplicationVersions.ToList().OrderBy(x => x.Version).ToObservableCollection(); - - ApplicationOsVersions = Context.ApplicationOsVersions.ToList().OrderBy(x => x.Version).ToObservableCollection(); - - ApplicationFirmwareVersions = Context.ApplicationFirmwareVersions.ToList().OrderBy(x => x.Version).ToObservableCollection(); - - ApplicationDisplayPanelVersions = Context.ApplicationDisplayPanelVersions.ToList().OrderBy(x => x.Version).ToObservableCollection(); - - EmbeddedFirmwareVersions = Context.EmbeddedFirmwareVersions.ToList().OrderBy(x => x.Version).ToObservableCollection(); - - EmbeddedSoftwareVersions = Context.EmbeddedSoftwareVersions.ToList().OrderBy(x => x.Version).ToObservableCollection(); - - HardwareVersions = Context.HardwareVersions.ToList().OrderBy(x => x.Version).ToObservableCollection(); - - IdsPacks = Context.IdsPacks.ToObservableCollection(); - - DispenserTypes = Context.DispenserTypes.ToObservableCollection(); - - LiquidTypes = Context.LiquidTypes.ToObservableCollection(); - - CartridgeTypes = Context.CartridgeTypes.ToObservableCollection(); - - MidTankTypes = Context.MidTankTypes.ToObservableCollection(); - - ActionTypes = Context.ActionTypes.ToObservableCollection(); - - EventTypesActions = Context.EventTypesActions.ToObservableCollection(); - - EventTypes = Context.EventTypes.ToObservableCollection(); - - foreach (var eventType in EventTypes) - { - eventType.EventTypesActions = eventType.EventTypesActions.ToObservableCollection(); - } - - MediaMaterials = Context.MediaMaterials.ToObservableCollection(); - - MediaColors = Context.MediaColors.ToObservableCollection(); - - MediaPurposes = Context.MediaPurposes.ToObservableCollection(); - - MediaConditions = Context.MediaConditions.ToObservableCollection(); - - LinearMassDensityUnits = Context.LinearMassDensityUnits.ToObservableCollection(); - - FiberShapes = Context.FiberShapes.ToObservableCollection(); - - FiberSynths = Context.FiberSynths.ToObservableCollection(); - - Rmls = Context.Rmls.ToObservableCollection(); - - LiquidTypesRmls = Context.LiquidTypesRmls.ToObservableCollection(); - - Ccts = Context.Ccts.ToObservableCollection(); - - Cats = Context.Cats.ToObservableCollection(); - - ProcessParametersTables = Context.ProcessParametersTables.ToObservableCollection(); - - ProcessParametersTablesGroups = Context.ProcessParametersTablesGroups.ToObservableCollection(); - - foreach (var group in ProcessParametersTablesGroups) - { - group.ProcessParametersTables = group.ProcessParametersTables.OrderBy(x => x.TableIndex).ToObservableCollection(); - } - - WindingMethods = Context.WindingMethods.ToObservableCollection(); - - Sensors = Context.Sensors.ToObservableCollection(); - - IdsPackFormulas = Context.IdsPackFormulas.ToObservableCollection(); - - ColorSpaces = Context.ColorSpaces.ToObservableCollection(); - - InitCollectionSources(); - - //var action = ActionTypes.First(); - - //action.Name = "Action 1 Yesss"; - - //SaveChanges(); - - //BindingOperations.EnableCollectionSynchronization(Machines, _syncLock); - //BindingOperations.EnableCollectionSynchronization(MachinesViewSource, _syncLock); - - //BindingOperations.EnableCollectionSynchronization(MachinesConfigurations, _syncLock); - //BindingOperations.EnableCollectionSynchronization(MachinesConfigurationsViewSource, _syncLock); - - //BindingOperations.EnableCollectionSynchronization(EventTypesActions, _syncLock); - //BindingOperations.EnableCollectionSynchronization(EventTypesActionsViewSource, _syncLock); - } - - /// - /// Creates a collection view from the specified observable collection. - /// - /// - /// The collection. - /// - private ICollectionView CreateCollectionView(ObservableCollection collection) - { - var view = CollectionViewSource.GetDefaultView(collection); - return view; - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapterExtension.cs b/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapterExtension.cs deleted file mode 100644 index 3123a453d..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapterExtension.cs +++ /dev/null @@ -1,1917 +0,0 @@ -using System.Collections.ObjectModel; -using System.ComponentModel; - -namespace Tango.DAL.Observables -{ - public partial class ObservablesEntitiesAdapter - { - - 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. - /// - public ObservableCollection
Addresses - { - get - { - return _addresses; - } - - set - { - _addresses = value; RaisePropertyChanged(nameof(Addresses)); - } - - } - - private ICollectionView _addressesViewSource; - /// - /// Gets or sets the Addresses View Source. - /// - public ICollectionView AddressesViewSource - { - get - { - return _addressesViewSource; - } - - set - { - _addressesViewSource = value; RaisePropertyChanged(nameof(AddressesViewSource)); - } - - } - - private ObservableCollection _applicationdisplaypanelversions; - /// - /// Gets or sets the ApplicationDisplayPanelVersions. - /// - public ObservableCollection ApplicationDisplayPanelVersions - { - get - { - return _applicationdisplaypanelversions; - } - - set - { - _applicationdisplaypanelversions = value; RaisePropertyChanged(nameof(ApplicationDisplayPanelVersions)); - } - - } - - private ICollectionView _applicationdisplaypanelversionsViewSource; - /// - /// Gets or sets the ApplicationDisplayPanelVersions View Source. - /// - public ICollectionView ApplicationDisplayPanelVersionsViewSource - { - get - { - return _applicationdisplaypanelversionsViewSource; - } - - set - { - _applicationdisplaypanelversionsViewSource = value; RaisePropertyChanged(nameof(ApplicationDisplayPanelVersionsViewSource)); - } - - } - - private ObservableCollection _applicationfirmwareversions; - /// - /// Gets or sets the ApplicationFirmwareVersions. - /// - public ObservableCollection ApplicationFirmwareVersions - { - get - { - return _applicationfirmwareversions; - } - - set - { - _applicationfirmwareversions = value; RaisePropertyChanged(nameof(ApplicationFirmwareVersions)); - } - - } - - private ICollectionView _applicationfirmwareversionsViewSource; - /// - /// Gets or sets the ApplicationFirmwareVersions View Source. - /// - public ICollectionView ApplicationFirmwareVersionsViewSource - { - get - { - return _applicationfirmwareversionsViewSource; - } - - set - { - _applicationfirmwareversionsViewSource = value; RaisePropertyChanged(nameof(ApplicationFirmwareVersionsViewSource)); - } - - } - - private ObservableCollection _applicationosversions; - /// - /// Gets or sets the ApplicationOsVersions. - /// - public ObservableCollection ApplicationOsVersions - { - get - { - return _applicationosversions; - } - - set - { - _applicationosversions = value; RaisePropertyChanged(nameof(ApplicationOsVersions)); - } - - } - - private ICollectionView _applicationosversionsViewSource; - /// - /// Gets or sets the ApplicationOsVersions View Source. - /// - public ICollectionView ApplicationOsVersionsViewSource - { - get - { - return _applicationosversionsViewSource; - } - - set - { - _applicationosversionsViewSource = value; RaisePropertyChanged(nameof(ApplicationOsVersionsViewSource)); - } - - } - - private ObservableCollection _applicationversions; - /// - /// Gets or sets the ApplicationVersions. - /// - public ObservableCollection ApplicationVersions - { - get - { - return _applicationversions; - } - - set - { - _applicationversions = value; RaisePropertyChanged(nameof(ApplicationVersions)); - } - - } - - private ICollectionView _applicationversionsViewSource; - /// - /// Gets or sets the ApplicationVersions View Source. - /// - public ICollectionView ApplicationVersionsViewSource - { - get - { - return _applicationversionsViewSource; - } - - set - { - _applicationversionsViewSource = value; RaisePropertyChanged(nameof(ApplicationVersionsViewSource)); - } - - } - - private ObservableCollection _brushstops; - /// - /// Gets or sets the BrushStops. - /// - public ObservableCollection BrushStops - { - get - { - return _brushstops; - } - - set - { - _brushstops = value; RaisePropertyChanged(nameof(BrushStops)); - } - - } - - private ICollectionView _brushstopsViewSource; - /// - /// Gets or sets the BrushStops View Source. - /// - public ICollectionView BrushStopsViewSource - { - get - { - return _brushstopsViewSource; - } - - set - { - _brushstopsViewSource = value; RaisePropertyChanged(nameof(BrushStopsViewSource)); - } - - } - - private ObservableCollection _cartridgetypes; - /// - /// Gets or sets the CartridgeTypes. - /// - public ObservableCollection CartridgeTypes - { - get - { - return _cartridgetypes; - } - - set - { - _cartridgetypes = value; RaisePropertyChanged(nameof(CartridgeTypes)); - } - - } - - private ICollectionView _cartridgetypesViewSource; - /// - /// Gets or sets the CartridgeTypes View Source. - /// - public ICollectionView CartridgeTypesViewSource - { - get - { - return _cartridgetypesViewSource; - } - - set - { - _cartridgetypesViewSource = value; RaisePropertyChanged(nameof(CartridgeTypesViewSource)); - } - - } - - private ObservableCollection _cats; - /// - /// Gets or sets the Cats. - /// - public ObservableCollection Cats - { - get - { - return _cats; - } - - set - { - _cats = value; RaisePropertyChanged(nameof(Cats)); - } - - } - - private ICollectionView _catsViewSource; - /// - /// Gets or sets the Cats View Source. - /// - public ICollectionView CatsViewSource - { - get - { - return _catsViewSource; - } - - set - { - _catsViewSource = value; RaisePropertyChanged(nameof(CatsViewSource)); - } - - } - - private ObservableCollection _ccts; - /// - /// Gets or sets the Ccts. - /// - public ObservableCollection Ccts - { - get - { - return _ccts; - } - - set - { - _ccts = value; RaisePropertyChanged(nameof(Ccts)); - } - - } - - private ICollectionView _cctsViewSource; - /// - /// Gets or sets the Ccts View Source. - /// - public ICollectionView CctsViewSource - { - get - { - return _cctsViewSource; - } - - set - { - _cctsViewSource = value; RaisePropertyChanged(nameof(CctsViewSource)); - } - - } - - private ObservableCollection _colorspaces; - /// - /// Gets or sets the ColorSpaces. - /// - public ObservableCollection ColorSpaces - { - get - { - return _colorspaces; - } - - set - { - _colorspaces = value; RaisePropertyChanged(nameof(ColorSpaces)); - } - - } - - private ICollectionView _colorspacesViewSource; - /// - /// Gets or sets the ColorSpaces View Source. - /// - public ICollectionView ColorSpacesViewSource - { - get - { - return _colorspacesViewSource; - } - - set - { - _colorspacesViewSource = value; RaisePropertyChanged(nameof(ColorSpacesViewSource)); - } - - } - - private ObservableCollection _configurations; - /// - /// Gets or sets the Configurations. - /// - public ObservableCollection Configurations - { - get - { - return _configurations; - } - - set - { - _configurations = value; RaisePropertyChanged(nameof(Configurations)); - } - - } - - private ICollectionView _configurationsViewSource; - /// - /// Gets or sets the Configurations View Source. - /// - public ICollectionView ConfigurationsViewSource - { - get - { - return _configurationsViewSource; - } - - set - { - _configurationsViewSource = value; RaisePropertyChanged(nameof(ConfigurationsViewSource)); - } - - } - - private ObservableCollection _contacts; - /// - /// Gets or sets the Contacts. - /// - public ObservableCollection Contacts - { - get - { - return _contacts; - } - - set - { - _contacts = value; RaisePropertyChanged(nameof(Contacts)); - } - - } - - private ICollectionView _contactsViewSource; - /// - /// Gets or sets the Contacts View Source. - /// - public ICollectionView ContactsViewSource - { - get - { - return _contactsViewSource; - } - - set - { - _contactsViewSource = value; RaisePropertyChanged(nameof(ContactsViewSource)); - } - - } - - private ObservableCollection _dispensertypes; - /// - /// Gets or sets the DispenserTypes. - /// - public ObservableCollection DispenserTypes - { - get - { - return _dispensertypes; - } - - set - { - _dispensertypes = value; RaisePropertyChanged(nameof(DispenserTypes)); - } - - } - - private ICollectionView _dispensertypesViewSource; - /// - /// Gets or sets the DispenserTypes View Source. - /// - public ICollectionView DispenserTypesViewSource - { - get - { - return _dispensertypesViewSource; - } - - set - { - _dispensertypesViewSource = value; RaisePropertyChanged(nameof(DispenserTypesViewSource)); - } - - } - - private ObservableCollection _embeddedfirmwareversions; - /// - /// Gets or sets the EmbeddedFirmwareVersions. - /// - public ObservableCollection EmbeddedFirmwareVersions - { - get - { - return _embeddedfirmwareversions; - } - - set - { - _embeddedfirmwareversions = value; RaisePropertyChanged(nameof(EmbeddedFirmwareVersions)); - } - - } - - private ICollectionView _embeddedfirmwareversionsViewSource; - /// - /// Gets or sets the EmbeddedFirmwareVersions View Source. - /// - public ICollectionView EmbeddedFirmwareVersionsViewSource - { - get - { - return _embeddedfirmwareversionsViewSource; - } - - set - { - _embeddedfirmwareversionsViewSource = value; RaisePropertyChanged(nameof(EmbeddedFirmwareVersionsViewSource)); - } - - } - - private ObservableCollection _embeddedsoftwareversions; - /// - /// Gets or sets the EmbeddedSoftwareVersions. - /// - public ObservableCollection EmbeddedSoftwareVersions - { - get - { - return _embeddedsoftwareversions; - } - - set - { - _embeddedsoftwareversions = value; RaisePropertyChanged(nameof(EmbeddedSoftwareVersions)); - } - - } - - private ICollectionView _embeddedsoftwareversionsViewSource; - /// - /// Gets or sets the EmbeddedSoftwareVersions View Source. - /// - public ICollectionView EmbeddedSoftwareVersionsViewSource - { - get - { - return _embeddedsoftwareversionsViewSource; - } - - set - { - _embeddedsoftwareversionsViewSource = value; RaisePropertyChanged(nameof(EmbeddedSoftwareVersionsViewSource)); - } - - } - - private ObservableCollection _eventtypes; - /// - /// Gets or sets the EventTypes. - /// - public ObservableCollection EventTypes - { - get - { - return _eventtypes; - } - - set - { - _eventtypes = value; RaisePropertyChanged(nameof(EventTypes)); - } - - } - - private ICollectionView _eventtypesViewSource; - /// - /// Gets or sets the EventTypes View Source. - /// - public ICollectionView EventTypesViewSource - { - get - { - return _eventtypesViewSource; - } - - set - { - _eventtypesViewSource = value; RaisePropertyChanged(nameof(EventTypesViewSource)); - } - - } - - 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 _fibershapes; - /// - /// Gets or sets the FiberShapes. - /// - public ObservableCollection FiberShapes - { - get - { - return _fibershapes; - } - - set - { - _fibershapes = value; RaisePropertyChanged(nameof(FiberShapes)); - } - - } - - private ICollectionView _fibershapesViewSource; - /// - /// Gets or sets the FiberShapes View Source. - /// - public ICollectionView FiberShapesViewSource - { - get - { - return _fibershapesViewSource; - } - - set - { - _fibershapesViewSource = value; RaisePropertyChanged(nameof(FiberShapesViewSource)); - } - - } - - private ObservableCollection _fibersynths; - /// - /// Gets or sets the FiberSynths. - /// - public ObservableCollection FiberSynths - { - get - { - return _fibersynths; - } - - set - { - _fibersynths = value; RaisePropertyChanged(nameof(FiberSynths)); - } - - } - - private ICollectionView _fibersynthsViewSource; - /// - /// Gets or sets the FiberSynths View Source. - /// - public ICollectionView FiberSynthsViewSource - { - get - { - return _fibersynthsViewSource; - } - - set - { - _fibersynthsViewSource = value; RaisePropertyChanged(nameof(FiberSynthsViewSource)); - } - - } - - private ObservableCollection _hardwareversions; - /// - /// Gets or sets the HardwareVersions. - /// - public ObservableCollection HardwareVersions - { - get - { - return _hardwareversions; - } - - set - { - _hardwareversions = value; RaisePropertyChanged(nameof(HardwareVersions)); - } - - } - - private ICollectionView _hardwareversionsViewSource; - /// - /// Gets or sets the HardwareVersions View Source. - /// - public ICollectionView HardwareVersionsViewSource - { - get - { - return _hardwareversionsViewSource; - } - - set - { - _hardwareversionsViewSource = value; RaisePropertyChanged(nameof(HardwareVersionsViewSource)); - } - - } - - private ObservableCollection _idspackformulas; - /// - /// Gets or sets the IdsPackFormulas. - /// - public ObservableCollection IdsPackFormulas - { - get - { - return _idspackformulas; - } - - set - { - _idspackformulas = value; RaisePropertyChanged(nameof(IdsPackFormulas)); - } - - } - - private ICollectionView _idspackformulasViewSource; - /// - /// Gets or sets the IdsPackFormulas View Source. - /// - public ICollectionView IdsPackFormulasViewSource - { - get - { - return _idspackformulasViewSource; - } - - set - { - _idspackformulasViewSource = value; RaisePropertyChanged(nameof(IdsPackFormulasViewSource)); - } - - } - - private ObservableCollection _idspacks; - /// - /// Gets or sets the IdsPacks. - /// - public ObservableCollection IdsPacks - { - get - { - return _idspacks; - } - - set - { - _idspacks = value; RaisePropertyChanged(nameof(IdsPacks)); - } - - } - - private ICollectionView _idspacksViewSource; - /// - /// Gets or sets the IdsPacks View Source. - /// - public ICollectionView IdsPacksViewSource - { - get - { - return _idspacksViewSource; - } - - set - { - _idspacksViewSource = value; RaisePropertyChanged(nameof(IdsPacksViewSource)); - } - - } - - private ObservableCollection _jobruns; - /// - /// Gets or sets the JobRuns. - /// - public ObservableCollection JobRuns - { - get - { - return _jobruns; - } - - set - { - _jobruns = value; RaisePropertyChanged(nameof(JobRuns)); - } - - } - - private ICollectionView _jobrunsViewSource; - /// - /// Gets or sets the JobRuns View Source. - /// - public ICollectionView JobRunsViewSource - { - get - { - return _jobrunsViewSource; - } - - set - { - _jobrunsViewSource = value; RaisePropertyChanged(nameof(JobRunsViewSource)); - } - - } - - private ObservableCollection _jobs; - /// - /// Gets or sets the Jobs. - /// - public ObservableCollection Jobs - { - get - { - return _jobs; - } - - set - { - _jobs = value; RaisePropertyChanged(nameof(Jobs)); - } - - } - - private ICollectionView _jobsViewSource; - /// - /// Gets or sets the Jobs View Source. - /// - public ICollectionView JobsViewSource - { - get - { - return _jobsViewSource; - } - - set - { - _jobsViewSource = value; RaisePropertyChanged(nameof(JobsViewSource)); - } - - } - - private ObservableCollection _linearmassdensityunits; - /// - /// Gets or sets the LinearMassDensityUnits. - /// - public ObservableCollection LinearMassDensityUnits - { - get - { - return _linearmassdensityunits; - } - - set - { - _linearmassdensityunits = value; RaisePropertyChanged(nameof(LinearMassDensityUnits)); - } - - } - - private ICollectionView _linearmassdensityunitsViewSource; - /// - /// Gets or sets the LinearMassDensityUnits View Source. - /// - public ICollectionView LinearMassDensityUnitsViewSource - { - get - { - return _linearmassdensityunitsViewSource; - } - - set - { - _linearmassdensityunitsViewSource = value; RaisePropertyChanged(nameof(LinearMassDensityUnitsViewSource)); - } - - } - - private ObservableCollection _liquidtypes; - /// - /// Gets or sets the LiquidTypes. - /// - public ObservableCollection LiquidTypes - { - get - { - return _liquidtypes; - } - - set - { - _liquidtypes = value; RaisePropertyChanged(nameof(LiquidTypes)); - } - - } - - private ICollectionView _liquidtypesViewSource; - /// - /// Gets or sets the LiquidTypes View Source. - /// - public ICollectionView LiquidTypesViewSource - { - get - { - return _liquidtypesViewSource; - } - - set - { - _liquidtypesViewSource = value; RaisePropertyChanged(nameof(LiquidTypesViewSource)); - } - - } - - private ObservableCollection _liquidtypesrmls; - /// - /// Gets or sets the LiquidTypesRmls. - /// - public ObservableCollection LiquidTypesRmls - { - get - { - return _liquidtypesrmls; - } - - set - { - _liquidtypesrmls = value; RaisePropertyChanged(nameof(LiquidTypesRmls)); - } - - } - - private ICollectionView _liquidtypesrmlsViewSource; - /// - /// Gets or sets the LiquidTypesRmls View Source. - /// - public ICollectionView LiquidTypesRmlsViewSource - { - get - { - return _liquidtypesrmlsViewSource; - } - - set - { - _liquidtypesrmlsViewSource = value; RaisePropertyChanged(nameof(LiquidTypesRmlsViewSource)); - } - - } - - private ObservableCollection _machineversions; - /// - /// Gets or sets the MachineVersions. - /// - public ObservableCollection MachineVersions - { - get - { - return _machineversions; - } - - set - { - _machineversions = value; RaisePropertyChanged(nameof(MachineVersions)); - } - - } - - private ICollectionView _machineversionsViewSource; - /// - /// Gets or sets the MachineVersions View Source. - /// - public ICollectionView MachineVersionsViewSource - { - get - { - return _machineversionsViewSource; - } - - set - { - _machineversionsViewSource = value; RaisePropertyChanged(nameof(MachineVersionsViewSource)); - } - - } - - private ObservableCollection _machines; - /// - /// Gets or sets the Machines. - /// - public ObservableCollection Machines - { - get - { - return _machines; - } - - set - { - _machines = value; RaisePropertyChanged(nameof(Machines)); - } - - } - - private ICollectionView _machinesViewSource; - /// - /// Gets or sets the Machines View Source. - /// - public ICollectionView MachinesViewSource - { - get - { - return _machinesViewSource; - } - - set - { - _machinesViewSource = value; RaisePropertyChanged(nameof(MachinesViewSource)); - } - - } - - private ObservableCollection _machinesconfigurations; - /// - /// Gets or sets the MachinesConfigurations. - /// - public ObservableCollection MachinesConfigurations - { - get - { - return _machinesconfigurations; - } - - set - { - _machinesconfigurations = value; RaisePropertyChanged(nameof(MachinesConfigurations)); - } - - } - - private ICollectionView _machinesconfigurationsViewSource; - /// - /// Gets or sets the MachinesConfigurations View Source. - /// - public ICollectionView MachinesConfigurationsViewSource - { - get - { - return _machinesconfigurationsViewSource; - } - - set - { - _machinesconfigurationsViewSource = value; RaisePropertyChanged(nameof(MachinesConfigurationsViewSource)); - } - - } - - private ObservableCollection _machinesevents; - /// - /// Gets or sets the MachinesEvents. - /// - public ObservableCollection MachinesEvents - { - get - { - return _machinesevents; - } - - set - { - _machinesevents = value; RaisePropertyChanged(nameof(MachinesEvents)); - } - - } - - private ICollectionView _machineseventsViewSource; - /// - /// Gets or sets the MachinesEvents View Source. - /// - public ICollectionView MachinesEventsViewSource - { - get - { - return _machineseventsViewSource; - } - - set - { - _machineseventsViewSource = value; RaisePropertyChanged(nameof(MachinesEventsViewSource)); - } - - } - - 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. - /// - public ObservableCollection MediaConditions - { - get - { - return _mediaconditions; - } - - set - { - _mediaconditions = value; RaisePropertyChanged(nameof(MediaConditions)); - } - - } - - private ICollectionView _mediaconditionsViewSource; - /// - /// Gets or sets the MediaConditions View Source. - /// - public ICollectionView MediaConditionsViewSource - { - get - { - return _mediaconditionsViewSource; - } - - set - { - _mediaconditionsViewSource = value; RaisePropertyChanged(nameof(MediaConditionsViewSource)); - } - - } - - private ObservableCollection _mediamaterials; - /// - /// Gets or sets the MediaMaterials. - /// - public ObservableCollection MediaMaterials - { - get - { - return _mediamaterials; - } - - set - { - _mediamaterials = value; RaisePropertyChanged(nameof(MediaMaterials)); - } - - } - - private ICollectionView _mediamaterialsViewSource; - /// - /// Gets or sets the MediaMaterials View Source. - /// - public ICollectionView MediaMaterialsViewSource - { - get - { - return _mediamaterialsViewSource; - } - - set - { - _mediamaterialsViewSource = value; RaisePropertyChanged(nameof(MediaMaterialsViewSource)); - } - - } - - private ObservableCollection _mediapurposes; - /// - /// Gets or sets the MediaPurposes. - /// - public ObservableCollection MediaPurposes - { - get - { - return _mediapurposes; - } - - set - { - _mediapurposes = value; RaisePropertyChanged(nameof(MediaPurposes)); - } - - } - - private ICollectionView _mediapurposesViewSource; - /// - /// Gets or sets the MediaPurposes View Source. - /// - public ICollectionView MediaPurposesViewSource - { - get - { - return _mediapurposesViewSource; - } - - set - { - _mediapurposesViewSource = value; RaisePropertyChanged(nameof(MediaPurposesViewSource)); - } - - } - - private ObservableCollection _midtanktypes; - /// - /// Gets or sets the MidTankTypes. - /// - public ObservableCollection MidTankTypes - { - get - { - return _midtanktypes; - } - - set - { - _midtanktypes = value; RaisePropertyChanged(nameof(MidTankTypes)); - } - - } - - private ICollectionView _midtanktypesViewSource; - /// - /// Gets or sets the MidTankTypes View Source. - /// - public ICollectionView MidTankTypesViewSource - { - get - { - return _midtanktypesViewSource; - } - - set - { - _midtanktypesViewSource = value; RaisePropertyChanged(nameof(MidTankTypesViewSource)); - } - - } - - private ObservableCollection _organizations; - /// - /// Gets or sets the Organizations. - /// - public ObservableCollection Organizations - { - get - { - return _organizations; - } - - set - { - _organizations = value; RaisePropertyChanged(nameof(Organizations)); - } - - } - - private ICollectionView _organizationsViewSource; - /// - /// Gets or sets the Organizations View Source. - /// - public ICollectionView OrganizationsViewSource - { - get - { - return _organizationsViewSource; - } - - set - { - _organizationsViewSource = value; RaisePropertyChanged(nameof(OrganizationsViewSource)); - } - - } - - private ObservableCollection _permissions; - /// - /// Gets or sets the Permissions. - /// - public ObservableCollection Permissions - { - get - { - return _permissions; - } - - set - { - _permissions = value; RaisePropertyChanged(nameof(Permissions)); - } - - } - - private ICollectionView _permissionsViewSource; - /// - /// Gets or sets the Permissions View Source. - /// - public ICollectionView PermissionsViewSource - { - get - { - return _permissionsViewSource; - } - - set - { - _permissionsViewSource = value; RaisePropertyChanged(nameof(PermissionsViewSource)); - } - - } - - private ObservableCollection _processparameterstables; - /// - /// Gets or sets the ProcessParametersTables. - /// - public ObservableCollection ProcessParametersTables - { - get - { - return _processparameterstables; - } - - set - { - _processparameterstables = value; RaisePropertyChanged(nameof(ProcessParametersTables)); - } - - } - - private ICollectionView _processparameterstablesViewSource; - /// - /// Gets or sets the ProcessParametersTables View Source. - /// - public ICollectionView ProcessParametersTablesViewSource - { - get - { - return _processparameterstablesViewSource; - } - - set - { - _processparameterstablesViewSource = value; RaisePropertyChanged(nameof(ProcessParametersTablesViewSource)); - } - - } - - private ObservableCollection _processparameterstablesgroups; - /// - /// Gets or sets the ProcessParametersTablesGroups. - /// - public ObservableCollection ProcessParametersTablesGroups - { - get - { - return _processparameterstablesgroups; - } - - set - { - _processparameterstablesgroups = value; RaisePropertyChanged(nameof(ProcessParametersTablesGroups)); - } - - } - - private ICollectionView _processparameterstablesgroupsViewSource; - /// - /// Gets or sets the ProcessParametersTablesGroups View Source. - /// - public ICollectionView ProcessParametersTablesGroupsViewSource - { - get - { - return _processparameterstablesgroupsViewSource; - } - - set - { - _processparameterstablesgroupsViewSource = value; RaisePropertyChanged(nameof(ProcessParametersTablesGroupsViewSource)); - } - - } - - private ObservableCollection _rmls; - /// - /// Gets or sets the Rmls. - /// - public ObservableCollection Rmls - { - get - { - return _rmls; - } - - set - { - _rmls = value; RaisePropertyChanged(nameof(Rmls)); - } - - } - - private ICollectionView _rmlsViewSource; - /// - /// Gets or sets the Rmls View Source. - /// - public ICollectionView RmlsViewSource - { - get - { - return _rmlsViewSource; - } - - set - { - _rmlsViewSource = value; RaisePropertyChanged(nameof(RmlsViewSource)); - } - - } - - private ObservableCollection _roles; - /// - /// Gets or sets the Roles. - /// - public ObservableCollection Roles - { - get - { - return _roles; - } - - set - { - _roles = value; RaisePropertyChanged(nameof(Roles)); - } - - } - - private ICollectionView _rolesViewSource; - /// - /// Gets or sets the Roles View Source. - /// - public ICollectionView RolesViewSource - { - get - { - return _rolesViewSource; - } - - set - { - _rolesViewSource = value; RaisePropertyChanged(nameof(RolesViewSource)); - } - - } - - private ObservableCollection _rolespermissions; - /// - /// Gets or sets the RolesPermissions. - /// - public ObservableCollection RolesPermissions - { - get - { - return _rolespermissions; - } - - set - { - _rolespermissions = value; RaisePropertyChanged(nameof(RolesPermissions)); - } - - } - - private ICollectionView _rolespermissionsViewSource; - /// - /// Gets or sets the RolesPermissions View Source. - /// - public ICollectionView RolesPermissionsViewSource - { - get - { - return _rolespermissionsViewSource; - } - - set - { - _rolespermissionsViewSource = value; RaisePropertyChanged(nameof(RolesPermissionsViewSource)); - } - - } - - private ObservableCollection _segments; - /// - /// Gets or sets the Segments. - /// - public ObservableCollection Segments - { - get - { - return _segments; - } - - set - { - _segments = value; RaisePropertyChanged(nameof(Segments)); - } - - } - - private ICollectionView _segmentsViewSource; - /// - /// Gets or sets the Segments View Source. - /// - public ICollectionView SegmentsViewSource - { - get - { - return _segmentsViewSource; - } - - set - { - _segmentsViewSource = value; RaisePropertyChanged(nameof(SegmentsViewSource)); - } - - } - - private ObservableCollection _sensors; - /// - /// Gets or sets the Sensors. - /// - public ObservableCollection Sensors - { - get - { - return _sensors; - } - - set - { - _sensors = value; RaisePropertyChanged(nameof(Sensors)); - } - - } - - private ICollectionView _sensorsViewSource; - /// - /// Gets or sets the Sensors View Source. - /// - public ICollectionView SensorsViewSource - { - get - { - return _sensorsViewSource; - } - - set - { - _sensorsViewSource = value; RaisePropertyChanged(nameof(SensorsViewSource)); - } - - } - - private ObservableCollection _syncconfigurations; - /// - /// Gets or sets the SyncConfigurations. - /// - public ObservableCollection SyncConfigurations - { - get - { - return _syncconfigurations; - } - - set - { - _syncconfigurations = value; RaisePropertyChanged(nameof(SyncConfigurations)); - } - - } - - private ICollectionView _syncconfigurationsViewSource; - /// - /// Gets or sets the SyncConfigurations View Source. - /// - public ICollectionView SyncConfigurationsViewSource - { - get - { - return _syncconfigurationsViewSource; - } - - set - { - _syncconfigurationsViewSource = value; RaisePropertyChanged(nameof(SyncConfigurationsViewSource)); - } - - } - - private ObservableCollection _users; - /// - /// Gets or sets the Users. - /// - public ObservableCollection Users - { - get - { - return _users; - } - - set - { - _users = value; RaisePropertyChanged(nameof(Users)); - } - - } - - private ICollectionView _usersViewSource; - /// - /// Gets or sets the Users View Source. - /// - public ICollectionView UsersViewSource - { - get - { - return _usersViewSource; - } - - set - { - _usersViewSource = value; RaisePropertyChanged(nameof(UsersViewSource)); - } - - } - - private ObservableCollection _usersroles; - /// - /// Gets or sets the UsersRoles. - /// - public ObservableCollection UsersRoles - { - get - { - return _usersroles; - } - - set - { - _usersroles = value; RaisePropertyChanged(nameof(UsersRoles)); - } - - } - - private ICollectionView _usersrolesViewSource; - /// - /// Gets or sets the UsersRoles View Source. - /// - public ICollectionView UsersRolesViewSource - { - get - { - return _usersrolesViewSource; - } - - set - { - _usersrolesViewSource = value; RaisePropertyChanged(nameof(UsersRolesViewSource)); - } - - } - - private ObservableCollection _windingmethods; - /// - /// Gets or sets the WindingMethods. - /// - public ObservableCollection WindingMethods - { - get - { - return _windingmethods; - } - - set - { - _windingmethods = value; RaisePropertyChanged(nameof(WindingMethods)); - } - - } - - private ICollectionView _windingmethodsViewSource; - /// - /// Gets or sets the WindingMethods View Source. - /// - public ICollectionView WindingMethodsViewSource - { - get - { - return _windingmethodsViewSource; - } - - set - { - _windingmethodsViewSource = value; RaisePropertyChanged(nameof(WindingMethodsViewSource)); - } - - } - - /// - /// Initialize collection sources. - /// - private void InitCollectionSources() - { - - ActionTypesViewSource = CreateCollectionView(ActionTypes); - - AddressesViewSource = CreateCollectionView(Addresses); - - ApplicationDisplayPanelVersionsViewSource = CreateCollectionView(ApplicationDisplayPanelVersions); - - ApplicationFirmwareVersionsViewSource = CreateCollectionView(ApplicationFirmwareVersions); - - ApplicationOsVersionsViewSource = CreateCollectionView(ApplicationOsVersions); - - ApplicationVersionsViewSource = CreateCollectionView(ApplicationVersions); - - BrushStopsViewSource = CreateCollectionView(BrushStops); - - CartridgeTypesViewSource = CreateCollectionView(CartridgeTypes); - - CatsViewSource = CreateCollectionView(Cats); - - CctsViewSource = CreateCollectionView(Ccts); - - ColorSpacesViewSource = CreateCollectionView(ColorSpaces); - - ConfigurationsViewSource = CreateCollectionView(Configurations); - - ContactsViewSource = CreateCollectionView(Contacts); - - DispenserTypesViewSource = CreateCollectionView(DispenserTypes); - - EmbeddedFirmwareVersionsViewSource = CreateCollectionView(EmbeddedFirmwareVersions); - - EmbeddedSoftwareVersionsViewSource = CreateCollectionView(EmbeddedSoftwareVersions); - - EventTypesViewSource = CreateCollectionView(EventTypes); - - EventTypesActionsViewSource = CreateCollectionView(EventTypesActions); - - FiberShapesViewSource = CreateCollectionView(FiberShapes); - - FiberSynthsViewSource = CreateCollectionView(FiberSynths); - - HardwareVersionsViewSource = CreateCollectionView(HardwareVersions); - - IdsPackFormulasViewSource = CreateCollectionView(IdsPackFormulas); - - IdsPacksViewSource = CreateCollectionView(IdsPacks); - - JobRunsViewSource = CreateCollectionView(JobRuns); - - JobsViewSource = CreateCollectionView(Jobs); - - LinearMassDensityUnitsViewSource = CreateCollectionView(LinearMassDensityUnits); - - LiquidTypesViewSource = CreateCollectionView(LiquidTypes); - - LiquidTypesRmlsViewSource = CreateCollectionView(LiquidTypesRmls); - - MachineVersionsViewSource = CreateCollectionView(MachineVersions); - - MachinesViewSource = CreateCollectionView(Machines); - - MachinesConfigurationsViewSource = CreateCollectionView(MachinesConfigurations); - - MachinesEventsViewSource = CreateCollectionView(MachinesEvents); - - MediaColorsViewSource = CreateCollectionView(MediaColors); - - MediaConditionsViewSource = CreateCollectionView(MediaConditions); - - MediaMaterialsViewSource = CreateCollectionView(MediaMaterials); - - MediaPurposesViewSource = CreateCollectionView(MediaPurposes); - - MidTankTypesViewSource = CreateCollectionView(MidTankTypes); - - OrganizationsViewSource = CreateCollectionView(Organizations); - - PermissionsViewSource = CreateCollectionView(Permissions); - - ProcessParametersTablesViewSource = CreateCollectionView(ProcessParametersTables); - - ProcessParametersTablesGroupsViewSource = CreateCollectionView(ProcessParametersTablesGroups); - - RmlsViewSource = CreateCollectionView(Rmls); - - RolesViewSource = CreateCollectionView(Roles); - - RolesPermissionsViewSource = CreateCollectionView(RolesPermissions); - - SegmentsViewSource = CreateCollectionView(Segments); - - SensorsViewSource = CreateCollectionView(Sensors); - - SyncConfigurationsViewSource = CreateCollectionView(SyncConfigurations); - - UsersViewSource = CreateCollectionView(Users); - - UsersRolesViewSource = CreateCollectionView(UsersRoles); - - WindingMethodsViewSource = CreateCollectionView(WindingMethods); - - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Partials/BrushStop.cs b/Software/Visual_Studio/Tango.DAL.Observables/Partials/BrushStop.cs deleted file mode 100644 index 7fd8e8c51..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Partials/BrushStop.cs +++ /dev/null @@ -1,156 +0,0 @@ -using ColorMine.ColorSpaces; -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using System.Reflection; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Media; -using Tango.Core; - -namespace Tango.DAL.Observables -{ - public partial class BrushStop - { - private ObservableCollection _inkVolumes; - [NotMapped] - public ObservableCollection InkVolumes - { - get { return _inkVolumes; } - set { _inkVolumes = value; RaisePropertyChangedAuto(); } - } - - private Color _color; - [NotMapped] - public Color Color - { - get { return _color; } - set - { - _color = value; - _red = _color.R; - _green = _color.G; - _blue = _color.B; - RaisePropertyChanged(nameof(Color)); - } - } - - public void SetInkVolumes(Configuration configuration) - { - InkVolumes = new ObservableCollection(); - - foreach (var idsPack in configuration.IdsPacks) - { - InkVolumes.Add(new InkVolume(configuration, idsPack, this)); - } - } - - [NotMapped] - public class InkVolume : ExtendedObject - { - private BrushStop _brushStop; - public BrushStop BrushStop - { - get { return _brushStop; } - set { _brushStop = value; RaisePropertyChangedAuto(); } - } - - private Configuration _configuration; - - public Configuration Configuration - { - get { return _configuration; } - set { _configuration = value; RaisePropertyChangedAuto(); } - } - - private IdsPack _idsPack; - public IdsPack IdsPack - { - get { return _idsPack; } - set { _idsPack = value; RaisePropertyChangedAuto(); } - } - - private double _volume; - public double Volume - { - get { return _volume; } - set { _volume = value; RaisePropertyChangedAuto(); OnVolumeChanged(); } - } - - public void Invalidate() - { - typeof(BrushStop).GetProperty("V" + Configuration.IdsPacks.IndexOf(IdsPack)).SetValue(BrushStop, Volume); - } - - public InkVolume(Configuration configuration, IdsPack idsPack, BrushStop brushStop) - { - BrushStop = brushStop; - IdsPack = idsPack; - Configuration = configuration; - - Volume = (double)typeof(BrushStop).GetProperty("V" + Configuration.IdsPacks.IndexOf(IdsPack)).GetValue(BrushStop); - } - - private void OnVolumeChanged() - { - Invalidate(); - } - } - - private bool _ignorePropChanged; - - protected override void RaisePropertyChanged(string propName) - { - base.RaisePropertyChanged(propName); - - if (!_ignorePropChanged && propName != nameof(ColorSpace) && ColorSpace != null) - { - Rgb rgb = new Rgb(Red, Green, Blue); - Cmyk cmyk = new Cmyk(Cyan, Magenta, Yellow, Black); - Lab lab = new Lab(L, A, B); - - switch ((ColorSpaces)ColorSpace.Code) - { - case ColorSpaces.RGB: - cmyk = rgb.To(); - lab = rgb.To(); - break; - case ColorSpaces.CMYK: - rgb = cmyk.To(); - lab = cmyk.To(); - break; - case ColorSpaces.LAB: - rgb = lab.To(); - cmyk = lab.To(); - break; - } - - _red = (int)rgb.R; - _green = (int)rgb.G; - _blue = (int)rgb.B; - - _cyan = cmyk.C * 100d; - _magenta = cmyk.M * 100d; - _yellow = cmyk.Y * 100d; - _black = cmyk.K * 100d; - - _l = lab.L; - _a = lab.A; - _b = lab.B; - - _color = Color.FromRgb((byte)_red, (byte)_green, (byte)_blue); - - _ignorePropChanged = true; - - foreach (var prop in typeof(BrushStop).GetProperties(BindingFlags.Instance | BindingFlags.Public)) - { - RaisePropertyChanged(prop.Name); - } - - _ignorePropChanged = false; - } - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Partials/Configuration.cs b/Software/Visual_Studio/Tango.DAL.Observables/Partials/Configuration.cs deleted file mode 100644 index c5cfb693f..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Partials/Configuration.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.DAL.Observables -{ - public partial class Configuration - { - public override void DefferedDelete() - { - IdsPacks.ToList().ForEach(x => x.DefferedDelete()); - var machine_configurations = ObservablesEntitiesAdapter.Instance.MachinesConfigurations.Where(x => x.Configuration == this); - MachinesConfigurations.ToList().ForEach(x => x.DefferedDelete()); - base.DefferedDelete(); - IdsPacks.Clear(); - } - - public override void Delete() - { - IdsPacks.ToList().ForEach(x => x.DefferedDelete()); - var machine_configurations = ObservablesEntitiesAdapter.Instance.MachinesConfigurations.Where(x => x.Configuration == this); - MachinesConfigurations.ToList().ForEach(x => x.DefferedDelete()); - base.Delete(); - IdsPacks.Clear(); - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Partials/Machine.cs b/Software/Visual_Studio/Tango.DAL.Observables/Partials/Machine.cs deleted file mode 100644 index c9782c91b..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Partials/Machine.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.DAL.Observables -{ - public partial class Machine - { - /// - /// Deletes this entity from the database - /// - public override void Delete() - { - foreach (var machine_config in MachinesConfigurations) - { - machine_config.Delete(); - machine_config.Configuration.Delete(); - } - - base.Delete(); - - ObservablesEntitiesAdapter.Instance.SaveChanges(); - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Partials/MachineVersion.cs b/Software/Visual_Studio/Tango.DAL.Observables/Partials/MachineVersion.cs deleted file mode 100644 index e027468dd..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Partials/MachineVersion.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.DAL.Observables -{ - public partial class MachineVersion - { - public override void Delete() - { - this.DefaultConfiguration.Delete(); - base.Delete(); - - ObservablesEntitiesAdapter.Instance.SaveChanges(); - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Partials/Segment.cs b/Software/Visual_Studio/Tango.DAL.Observables/Partials/Segment.cs deleted file mode 100644 index f01afb398..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Partials/Segment.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.DAL.Observables -{ - public partial class Segment - { - public override void Save() - { - for (int i = 0; i < BrushStops.Count; i++) - { - BrushStops[i].StopIndex = i; - } - - base.Save(); - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Partials/User.cs b/Software/Visual_Studio/Tango.DAL.Observables/Partials/User.cs deleted file mode 100644 index c7cb30118..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Partials/User.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.DAL.Observables -{ - public partial class User - { - /// - /// Determines whether the user has the specified permission. - /// - /// The permission. - /// - /// true if the user has permission; otherwise, false. - /// - public bool HasPermission(Permissions permission) - { - return UsersRoles.Select(x => x.Role).ToList().SelectMany(x => x.RolesPermissions).ToList().Exists(x => x.Permission.Code == permission.ToInt32()); - } - - /// - /// Gets the aggregated user roles as enumerations. - /// - public List Roles - { - get { return UsersRoles.Select(x => (Roles)x.Role.Code).ToList(); } - } - - /// - /// Gets the aggregated user permissions as enumerations. - /// - public List Permissions - { - get { return UsersRoles.Select(x => x.Role).ToList().SelectMany(x => x.RolesPermissions).Select(x => (Permissions)x.Permission.Code).ToList(); } - } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.DAL.Observables/Properties/AssemblyInfo.cs deleted file mode 100644 index 322413ef9..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,6 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("Tango - Data Access Layer Observables Mapping")] -[assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Tango.DAL.Observables.csproj b/Software/Visual_Studio/Tango.DAL.Observables/Tango.DAL.Observables.csproj deleted file mode 100644 index e9ab08ed5..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/Tango.DAL.Observables.csproj +++ /dev/null @@ -1,185 +0,0 @@ - - - - - Debug - AnyCPU - {0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF} - Library - Properties - Tango.DAL.Observables - Tango.DAL.Observables - v4.6 - 512 - - - true - full - false - ..\Build\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\DeepCloner.0.10.2\lib\net40\DeepCloner.dll - - - ..\packages\EntityFramework.6.0.0\lib\net45\EntityFramework.dll - - - ..\packages\EntityFramework.6.0.0\lib\net45\EntityFramework.SqlServer.dll - - - ..\packages\Humanizer.Core.2.2.0\lib\netstandard1.0\Humanizer.dll - - - - - - - - - - - - - - - - - - GlobalVersionInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {37e4ceab-b54b-451f-b535-04cf7da9c459} - ColorMine - - - {caedae94-11ed-473c-888a-268a6d38cd20} - Tango.CodeGeneration - - - {a34ee0f0-649d-41c8-8489-b6f1cc6924ee} - Tango.Core - - - {38197109-8610-4d3f-92b9-16d48df94d7c} - Tango.DAL.Remote - - - {d8f1ad85-526a-4f50-b6dc-d437af63d8d8} - Tango.Settings - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.DAL.Observables/packages.config b/Software/Visual_Studio/Tango.DAL.Observables/packages.config deleted file mode 100644 index 0650c2517..000000000 --- a/Software/Visual_Studio/Tango.DAL.Observables/packages.config +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Integration/Formulation/DiluterFormulaCalculator.cs b/Software/Visual_Studio/Tango.Integration/Formulation/DiluterFormulaCalculator.cs new file mode 100644 index 000000000..178b151fd --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Formulation/DiluterFormulaCalculator.cs @@ -0,0 +1,38 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.Integration.Observables; +using Tango.Integration.Printing; + +namespace Tango.Integration.Formulation +{ + [Formula(IdsPackFormulas.Diluter)] + public class DiluterFormulaCalculator : IFormulaCalculator + { + public double CalculateNanoliterPerSecond(LiquidVolume liquidVolume) + { + if (liquidVolume.Configuration != null && liquidVolume.RML != null) + { + return (liquidVolume.Volume / 100d) * (liquidVolume.LiquidMaxNanoliterPerCentimeter * liquidVolume.RML.ProcessParametersTablesGroups.SingleOrDefault(x => x.Active).ProcessParametersTables.FirstOrDefault().DyeingSpeed); + } + else + { + return 0d; + } + } + + public double CalculatePulsePerSecond(LiquidVolume liquidVolume) + { + var nlPerSecond = CalculateNanoliterPerSecond(liquidVolume); + return nlPerSecond / liquidVolume.IdsPack.DispenserType.NlPerPulse; + } + + public double CoerceVolume(LiquidVolume liquidVolume) + { + double sum = liquidVolume.BrushStop.LiquidVolumes.Where(x => (IdsPackFormulas)x.IdsPack.IdsPackFormula.Code == IdsPackFormulas.StandardColor).Sum(x => x.Volume); + return Math.Max(Math.Min(100d - sum, 100d), 0); + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Formulation/FormulaAttribute.cs b/Software/Visual_Studio/Tango.Integration/Formulation/FormulaAttribute.cs new file mode 100644 index 000000000..521c12ea3 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Formulation/FormulaAttribute.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.Integration.Observables; + +namespace Tango.Integration.Formulation +{ + public class FormulaAttribute : Attribute + { + public IdsPackFormulas Formula { get; set; } + + public FormulaAttribute(IdsPackFormulas formula) + { + Formula = formula; + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Formulation/FormulaResolver.cs b/Software/Visual_Studio/Tango.Integration/Formulation/FormulaResolver.cs new file mode 100644 index 000000000..d30d077b8 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Formulation/FormulaResolver.cs @@ -0,0 +1,36 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.Integration.Observables; +using Tango.Integration.Printing; +using System.Reflection; + +namespace Tango.Integration.Formulation +{ + public static class FormulaResolver + { + private static List> _calculators { get; set; } + + static FormulaResolver() + { + _calculators = new List>(); + + foreach (var type in typeof(FormulaResolver).Assembly.GetTypes().Where(x => x.GetCustomAttribute() != null)) + { + _calculators.Add(new KeyValuePair(type.GetCustomAttribute().Formula, Activator.CreateInstance(type) as IFormulaCalculator)); + } + } + + public static IFormulaCalculator Resolve(LiquidVolume liquidVolume) + { + return _calculators.SingleOrDefault(x => x.Key == (IdsPackFormulas)liquidVolume.IdsPack.IdsPackFormula.Code).Value; + } + + public static IFormulaCalculator Resolve(IdsPackFormulas formulaCode) + { + return _calculators.SingleOrDefault(x => x.Key == formulaCode).Value; + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Formulation/FormulasCalculationService.cs b/Software/Visual_Studio/Tango.Integration/Formulation/FormulasCalculationService.cs new file mode 100644 index 000000000..823327cb2 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Formulation/FormulasCalculationService.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.Integration.Printing; + +namespace Tango.Integration.Formulation +{ + public static class FormulasCalculationService + { + public static double CalculateNanoliterPerSecond(LiquidVolume liquidVolume) + { + IFormulaCalculator formula = FormulaResolver.Resolve(liquidVolume); + return formula.CalculateNanoliterPerSecond(liquidVolume); + } + + public static double CalculatePulsePerSecond(LiquidVolume liquidVolume) + { + IFormulaCalculator formula = FormulaResolver.Resolve(liquidVolume); + return formula.CalculatePulsePerSecond(liquidVolume); + } + + public static double CoerceVolume(LiquidVolume liquidVolume) + { + IFormulaCalculator formula = FormulaResolver.Resolve(liquidVolume); + return formula.CoerceVolume(liquidVolume); + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Formulation/IFormulaCalculator.cs b/Software/Visual_Studio/Tango.Integration/Formulation/IFormulaCalculator.cs new file mode 100644 index 000000000..349f1d92d --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Formulation/IFormulaCalculator.cs @@ -0,0 +1,13 @@ +using Tango.Integration.Printing; + +namespace Tango.Integration.Formulation +{ + public interface IFormulaCalculator + { + double CalculateNanoliterPerSecond(LiquidVolume liquidVolume); + + double CalculatePulsePerSecond(LiquidVolume liquidVolume); + + double CoerceVolume(LiquidVolume liquidVolume); + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Formulation/StandardColorFormulaCalculator.cs b/Software/Visual_Studio/Tango.Integration/Formulation/StandardColorFormulaCalculator.cs new file mode 100644 index 000000000..1338a0afb --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Formulation/StandardColorFormulaCalculator.cs @@ -0,0 +1,38 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.Integration.Observables; +using Tango.Integration.Printing; +using static Tango.Integration.Observables.BrushStop; + +namespace Tango.Integration.Formulation +{ + [Formula(IdsPackFormulas.StandardColor)] + public class StandardColorFormulaCalculator : IFormulaCalculator + { + public double CalculateNanoliterPerSecond(LiquidVolume liquidVolume) + { + if (liquidVolume.Configuration != null && liquidVolume.RML != null) + { + return (liquidVolume.Volume / 100d) * (liquidVolume.LiquidMaxNanoliterPerCentimeter * liquidVolume.RML.ProcessParametersTablesGroups.SingleOrDefault(x => x.Active).ProcessParametersTables.FirstOrDefault().DyeingSpeed); + } + else + { + return 0d; + } + } + + public double CalculatePulsePerSecond(LiquidVolume liquidVolume) + { + var nlPerSecond = CalculateNanoliterPerSecond(liquidVolume); + return nlPerSecond / liquidVolume.IdsPack.DispenserType.NlPerPulse; + } + + public double CoerceVolume(LiquidVolume liquidVolume) + { + return liquidVolume.Volume; + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/ActionType.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/ActionType.cs new file mode 100644 index 000000000..b3f5c7e1f --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/ActionType.cs @@ -0,0 +1,104 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("ACTION_TYPES")] + public partial class ActionType : ObservableEntity + { + + protected Int32 _code; + /// + /// Gets or sets the actiontype code. + /// + [Column("CODE")] + + public Int32 Code + { + get + { + return _code; + } + + set + { + _code = value; RaisePropertyChanged(nameof(Code)); + } + + } + + protected String _name; + /// + /// Gets or sets the actiontype name. + /// + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected String _description; + /// + /// Gets or sets the actiontype description. + /// + [Column("DESCRIPTION")] + + public String Description + { + get + { + return _description; + } + + set + { + _description = value; RaisePropertyChanged(nameof(Description)); + } + + } + + protected ObservableCollection _eventtypesactions; + /// + /// Gets or sets the actiontype event types actions. + /// + + public virtual ObservableCollection EventTypesActions + { + get + { + return _eventtypesactions; + } + + set + { + _eventtypesactions = value; RaisePropertyChanged(nameof(EventTypesActions)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public ActionType() : base() + { + + EventTypesActions = new ObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Address.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Address.cs new file mode 100644 index 000000000..f736572df --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Address.cs @@ -0,0 +1,225 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("ADDRESSES")] + public partial class Address : ObservableEntity
+ { + + protected Boolean _deleted; + /// + /// Gets or sets the address deleted. + /// + [Column("DELETED")] + + public Boolean Deleted + { + get + { + return _deleted; + } + + set + { + _deleted = value; RaisePropertyChanged(nameof(Deleted)); + } + + } + + protected String _addressstring; + /// + /// Gets or sets the address address string. + /// + [Column("ADDRESS_STRING")] + + public String AddressString + { + get + { + return _addressstring; + } + + set + { + _addressstring = value; RaisePropertyChanged(nameof(AddressString)); + } + + } + + protected String _locality; + /// + /// Gets or sets the address locality. + /// + [Column("LOCALITY")] + + public String Locality + { + get + { + return _locality; + } + + set + { + _locality = value; RaisePropertyChanged(nameof(Locality)); + } + + } + + protected String _country; + /// + /// Gets or sets the address country. + /// + [Column("COUNTRY")] + + public String Country + { + get + { + return _country; + } + + set + { + _country = value; RaisePropertyChanged(nameof(Country)); + } + + } + + protected String _city; + /// + /// Gets or sets the address city. + /// + [Column("CITY")] + + public String City + { + get + { + return _city; + } + + set + { + _city = value; RaisePropertyChanged(nameof(City)); + } + + } + + protected String _state; + /// + /// Gets or sets the address state. + /// + [Column("STATE")] + + public String State + { + get + { + return _state; + } + + set + { + _state = value; RaisePropertyChanged(nameof(State)); + } + + } + + protected String _countrycode; + /// + /// Gets or sets the address country code. + /// + [Column("COUNTRY_CODE")] + + public String CountryCode + { + get + { + return _countrycode; + } + + set + { + _countrycode = value; RaisePropertyChanged(nameof(CountryCode)); + } + + } + + protected String _postalcode; + /// + /// Gets or sets the address postal code. + /// + [Column("POSTAL_CODE")] + + public String PostalCode + { + get + { + return _postalcode; + } + + set + { + _postalcode = value; RaisePropertyChanged(nameof(PostalCode)); + } + + } + + protected ObservableCollection _organizations; + /// + /// Gets or sets the address organizations. + /// + + public virtual ObservableCollection Organizations + { + get + { + return _organizations; + } + + set + { + _organizations = value; RaisePropertyChanged(nameof(Organizations)); + } + + } + + protected ObservableCollection _users; + /// + /// Gets or sets the address users. + /// + + public virtual ObservableCollection Users + { + get + { + return _users; + } + + set + { + _users = value; RaisePropertyChanged(nameof(Users)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public Address() : base() + { + + Organizations = new ObservableCollection(); + + Users = new ObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/ApplicationDisplayPanelVersion.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/ApplicationDisplayPanelVersion.cs new file mode 100644 index 000000000..dd3c3ce14 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/ApplicationDisplayPanelVersion.cs @@ -0,0 +1,84 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("APPLICATION_DISPLAY_PANEL_VERSIONS")] + public partial class ApplicationDisplayPanelVersion : ObservableEntity + { + + protected Double _version; + /// + /// Gets or sets the applicationdisplaypanelversion version. + /// + [Column("VERSION")] + + public Double Version + { + get + { + return _version; + } + + set + { + _version = value; RaisePropertyChanged(nameof(Version)); + } + + } + + protected String _name; + /// + /// Gets or sets the applicationdisplaypanelversion name. + /// + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected ObservableCollection _configurations; + /// + /// Gets or sets the applicationdisplaypanelversion configurations. + /// + + public virtual ObservableCollection Configurations + { + get + { + return _configurations; + } + + set + { + _configurations = value; RaisePropertyChanged(nameof(Configurations)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public ApplicationDisplayPanelVersion() : base() + { + + Configurations = new ObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/ApplicationFirmwareVersion.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/ApplicationFirmwareVersion.cs new file mode 100644 index 000000000..8d5868e2a --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/ApplicationFirmwareVersion.cs @@ -0,0 +1,84 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("APPLICATION_FIRMWARE_VERSIONS")] + public partial class ApplicationFirmwareVersion : ObservableEntity + { + + protected Double _version; + /// + /// Gets or sets the applicationfirmwareversion version. + /// + [Column("VERSION")] + + public Double Version + { + get + { + return _version; + } + + set + { + _version = value; RaisePropertyChanged(nameof(Version)); + } + + } + + protected String _name; + /// + /// Gets or sets the applicationfirmwareversion name. + /// + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected ObservableCollection _configurations; + /// + /// Gets or sets the applicationfirmwareversion configurations. + /// + + public virtual ObservableCollection Configurations + { + get + { + return _configurations; + } + + set + { + _configurations = value; RaisePropertyChanged(nameof(Configurations)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public ApplicationFirmwareVersion() : base() + { + + Configurations = new ObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/ApplicationOsVersion.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/ApplicationOsVersion.cs new file mode 100644 index 000000000..844a4ac99 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/ApplicationOsVersion.cs @@ -0,0 +1,84 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("APPLICATION_OS_VERSIONS")] + public partial class ApplicationOsVersion : ObservableEntity + { + + protected Double _version; + /// + /// Gets or sets the applicationosversion version. + /// + [Column("VERSION")] + + public Double Version + { + get + { + return _version; + } + + set + { + _version = value; RaisePropertyChanged(nameof(Version)); + } + + } + + protected String _name; + /// + /// Gets or sets the applicationosversion name. + /// + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected ObservableCollection _configurations; + /// + /// Gets or sets the applicationosversion configurations. + /// + + public virtual ObservableCollection Configurations + { + get + { + return _configurations; + } + + set + { + _configurations = value; RaisePropertyChanged(nameof(Configurations)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public ApplicationOsVersion() : base() + { + + Configurations = new ObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/ApplicationVersion.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/ApplicationVersion.cs new file mode 100644 index 000000000..23e530e9b --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/ApplicationVersion.cs @@ -0,0 +1,84 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("APPLICATION_VERSIONS")] + public partial class ApplicationVersion : ObservableEntity + { + + protected Double _version; + /// + /// Gets or sets the applicationversion version. + /// + [Column("VERSION")] + + public Double Version + { + get + { + return _version; + } + + set + { + _version = value; RaisePropertyChanged(nameof(Version)); + } + + } + + protected String _name; + /// + /// Gets or sets the applicationversion name. + /// + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected ObservableCollection _configurations; + /// + /// Gets or sets the applicationversion configurations. + /// + + public virtual ObservableCollection Configurations + { + get + { + return _configurations; + } + + set + { + _configurations = value; RaisePropertyChanged(nameof(Configurations)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public ApplicationVersion() : base() + { + + Configurations = new ObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/BrushStop.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/BrushStop.cs new file mode 100644 index 000000000..c41547588 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/BrushStop.cs @@ -0,0 +1,519 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("BRUSH_STOPS")] + public partial class BrushStop : ObservableEntity + { + + protected String _segmentguid; + /// + /// Gets or sets the brushstop segment guid. + /// + [Column("SEGMENT_GUID")] + [ForeignKey("Segment")] + public String SegmentGuid + { + get + { + return _segmentguid; + } + + set + { + _segmentguid = value; RaisePropertyChanged(nameof(SegmentGuid)); + } + + } + + protected String _colorspaceguid; + /// + /// Gets or sets the brushstop color space guid. + /// + [Column("COLOR_SPACE_GUID")] + [ForeignKey("ColorSpace")] + public String ColorSpaceGuid + { + get + { + return _colorspaceguid; + } + + set + { + _colorspaceguid = value; RaisePropertyChanged(nameof(ColorSpaceGuid)); + } + + } + + protected Double _offsetpercent; + /// + /// Gets or sets the brushstop offset percent. + /// + [Column("OFFSET_PERCENT")] + + public Double OffsetPercent + { + get + { + return _offsetpercent; + } + + set + { + _offsetpercent = value; RaisePropertyChanged(nameof(OffsetPercent)); + } + + } + + protected Int32 _stopindex; + /// + /// Gets or sets the brushstop stop index. + /// + [Column("STOP_INDEX")] + + public Int32 StopIndex + { + get + { + return _stopindex; + } + + set + { + _stopindex = value; RaisePropertyChanged(nameof(StopIndex)); + } + + } + + protected Double _cyan; + /// + /// Gets or sets the brushstop cyan. + /// + [Column("CYAN")] + + public Double Cyan + { + get + { + return _cyan; + } + + set + { + _cyan = value; RaisePropertyChanged(nameof(Cyan)); + } + + } + + protected Double _magenta; + /// + /// Gets or sets the brushstop magenta. + /// + [Column("MAGENTA")] + + public Double Magenta + { + get + { + return _magenta; + } + + set + { + _magenta = value; RaisePropertyChanged(nameof(Magenta)); + } + + } + + protected Double _yellow; + /// + /// Gets or sets the brushstop yellow. + /// + [Column("YELLOW")] + + public Double Yellow + { + get + { + return _yellow; + } + + set + { + _yellow = value; RaisePropertyChanged(nameof(Yellow)); + } + + } + + protected Double _black; + /// + /// Gets or sets the brushstop black. + /// + [Column("BLACK")] + + public Double Black + { + get + { + return _black; + } + + set + { + _black = value; RaisePropertyChanged(nameof(Black)); + } + + } + + protected Int32 _red; + /// + /// Gets or sets the brushstop red. + /// + [Column("RED")] + + public Int32 Red + { + get + { + return _red; + } + + set + { + _red = value; RaisePropertyChanged(nameof(Red)); + } + + } + + protected Int32 _green; + /// + /// Gets or sets the brushstop green. + /// + [Column("GREEN")] + + public Int32 Green + { + get + { + return _green; + } + + set + { + _green = value; RaisePropertyChanged(nameof(Green)); + } + + } + + protected Int32 _blue; + /// + /// Gets or sets the brushstop blue. + /// + [Column("BLUE")] + + public Int32 Blue + { + get + { + return _blue; + } + + set + { + _blue = value; RaisePropertyChanged(nameof(Blue)); + } + + } + + protected Double _l; + /// + /// Gets or sets the brushstop l. + /// + [Column("L")] + + public Double L + { + get + { + return _l; + } + + set + { + _l = value; RaisePropertyChanged(nameof(L)); + } + + } + + protected Double _a; + /// + /// Gets or sets the brushstop a. + /// + [Column("A")] + + public Double A + { + get + { + return _a; + } + + set + { + _a = value; RaisePropertyChanged(nameof(A)); + } + + } + + protected Double _b; + /// + /// Gets or sets the brushstop b. + /// + [Column("B")] + + public Double B + { + get + { + return _b; + } + + set + { + _b = value; RaisePropertyChanged(nameof(B)); + } + + } + + protected Double _v0; + /// + /// Gets or sets the brushstop v0. + /// + [Column("V0")] + + public Double V0 + { + get + { + return _v0; + } + + set + { + _v0 = value; RaisePropertyChanged(nameof(V0)); + } + + } + + protected Double _v1; + /// + /// Gets or sets the brushstop v1. + /// + [Column("V1")] + + public Double V1 + { + get + { + return _v1; + } + + set + { + _v1 = value; RaisePropertyChanged(nameof(V1)); + } + + } + + protected Double _v2; + /// + /// Gets or sets the brushstop v2. + /// + [Column("V2")] + + public Double V2 + { + get + { + return _v2; + } + + set + { + _v2 = value; RaisePropertyChanged(nameof(V2)); + } + + } + + protected Double _v3; + /// + /// Gets or sets the brushstop v3. + /// + [Column("V3")] + + public Double V3 + { + get + { + return _v3; + } + + set + { + _v3 = value; RaisePropertyChanged(nameof(V3)); + } + + } + + protected Double _v4; + /// + /// Gets or sets the brushstop v4. + /// + [Column("V4")] + + public Double V4 + { + get + { + return _v4; + } + + set + { + _v4 = value; RaisePropertyChanged(nameof(V4)); + } + + } + + protected Double _v5; + /// + /// Gets or sets the brushstop v5. + /// + [Column("V5")] + + public Double V5 + { + get + { + return _v5; + } + + set + { + _v5 = value; RaisePropertyChanged(nameof(V5)); + } + + } + + protected Double _v6; + /// + /// Gets or sets the brushstop v6. + /// + [Column("V6")] + + public Double V6 + { + get + { + return _v6; + } + + set + { + _v6 = value; RaisePropertyChanged(nameof(V6)); + } + + } + + protected Double _v7; + /// + /// Gets or sets the brushstop v7. + /// + [Column("V7")] + + public Double V7 + { + get + { + return _v7; + } + + set + { + _v7 = value; RaisePropertyChanged(nameof(V7)); + } + + } + + protected String _pantonguid; + /// + /// Gets or sets the brushstop panton guid. + /// + [Column("PANTON_GUID")] + public String PantonGuid + { + get + { + return _pantonguid; + } + + set + { + _pantonguid = value; RaisePropertyChanged(nameof(PantonGuid)); + } + + } + + protected ColorSpace _colorspace; + /// + /// Gets or sets the brushstop color spaces. + /// + + public virtual ColorSpace ColorSpace + { + get + { + return _colorspace; + } + + set + { + _colorspace = value; RaisePropertyChanged(nameof(ColorSpace)); + } + + } + + protected Segment _segment; + /// + /// Gets or sets the brushstop segment. + /// + + public virtual Segment Segment + { + get + { + return _segment; + } + + set + { + _segment = value; RaisePropertyChanged(nameof(Segment)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public BrushStop() : base() + { + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/CartridgeType.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/CartridgeType.cs new file mode 100644 index 000000000..532f6416d --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/CartridgeType.cs @@ -0,0 +1,84 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("CARTRIDGE_TYPES")] + public partial class CartridgeType : ObservableEntity + { + + protected Int32 _code; + /// + /// Gets or sets the cartridgetype code. + /// + [Column("CODE")] + + public Int32 Code + { + get + { + return _code; + } + + set + { + _code = value; RaisePropertyChanged(nameof(Code)); + } + + } + + protected String _name; + /// + /// Gets or sets the cartridgetype name. + /// + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected ObservableCollection _idspacks; + /// + /// Gets or sets the cartridgetype ids packs. + /// + + public virtual ObservableCollection IdsPacks + { + get + { + return _idspacks; + } + + set + { + _idspacks = value; RaisePropertyChanged(nameof(IdsPacks)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public CartridgeType() : base() + { + + IdsPacks = new ObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Cat.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Cat.cs new file mode 100644 index 000000000..80d47a247 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Cat.cs @@ -0,0 +1,140 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("CATS")] + public partial class Cat : ObservableEntity + { + + protected String _name; + /// + /// Gets or sets the cat name. + /// + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected String _liquidtypeguid; + /// + /// Gets or sets the cat liquid type guid. + /// + [Column("LIQUID_TYPE_GUID")] + [ForeignKey("LiquidType")] + public String LiquidTypeGuid + { + get + { + return _liquidtypeguid; + } + + set + { + _liquidtypeguid = value; RaisePropertyChanged(nameof(LiquidTypeGuid)); + } + + } + + protected String _rmlguid; + /// + /// Gets or sets the cat rml guid. + /// + [Column("RML_GUID")] + [ForeignKey("Rml")] + public String RmlGuid + { + get + { + return _rmlguid; + } + + set + { + _rmlguid = value; RaisePropertyChanged(nameof(RmlGuid)); + } + + } + + protected Byte[] _data; + /// + /// Gets or sets the cat data. + /// + [Column("DATA")] + + public Byte[] Data + { + get + { + return _data; + } + + set + { + _data = value; RaisePropertyChanged(nameof(Data)); + } + + } + + protected LiquidType _liquidtype; + /// + /// Gets or sets the cat liquid types. + /// + + public virtual LiquidType LiquidType + { + get + { + return _liquidtype; + } + + set + { + _liquidtype = value; RaisePropertyChanged(nameof(LiquidType)); + } + + } + + protected Rml _rml; + /// + /// Gets or sets the cat rml. + /// + + public virtual Rml Rml + { + get + { + return _rml; + } + + set + { + _rml = value; RaisePropertyChanged(nameof(Rml)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public Cat() : base() + { + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Cct.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Cct.cs new file mode 100644 index 000000000..069e1df1d --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Cct.cs @@ -0,0 +1,201 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("CCTS")] + public partial class Cct : ObservableEntity + { + + protected String _name; + /// + /// Gets or sets the cct name. + /// + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected String _description; + /// + /// Gets or sets the cct description. + /// + [Column("DESCRIPTION")] + + public String Description + { + get + { + return _description; + } + + set + { + _description = value; RaisePropertyChanged(nameof(Description)); + } + + } + + protected String _forwardfilename; + /// + /// Gets or sets the cct forward file name. + /// + [Column("FORWARD_FILE_NAME")] + + public String ForwardFileName + { + get + { + return _forwardfilename; + } + + set + { + _forwardfilename = value; RaisePropertyChanged(nameof(ForwardFileName)); + } + + } + + protected String _inversefilename; + /// + /// Gets or sets the cct inverse file name. + /// + [Column("INVERSE_FILE_NAME")] + + public String InverseFileName + { + get + { + return _inversefilename; + } + + set + { + _inversefilename = value; RaisePropertyChanged(nameof(InverseFileName)); + } + + } + + protected Byte[] _forwarddata; + /// + /// Gets or sets the cct forward data. + /// + [Column("FORWARD_DATA")] + + public Byte[] ForwardData + { + get + { + return _forwarddata; + } + + set + { + _forwarddata = value; RaisePropertyChanged(nameof(ForwardData)); + } + + } + + protected Byte[] _inversedata; + /// + /// Gets or sets the cct inverse data. + /// + [Column("INVERSE_DATA")] + + public Byte[] InverseData + { + get + { + return _inversedata; + } + + set + { + _inversedata = value; RaisePropertyChanged(nameof(InverseData)); + } + + } + + protected Double _version; + /// + /// Gets or sets the cct version. + /// + [Column("VERSION")] + + public Double Version + { + get + { + return _version; + } + + set + { + _version = value; RaisePropertyChanged(nameof(Version)); + } + + } + + protected String _rmlguid; + /// + /// Gets or sets the cct rml guid. + /// + [Column("RML_GUID")] + [ForeignKey("Rml")] + public String RmlGuid + { + get + { + return _rmlguid; + } + + set + { + _rmlguid = value; RaisePropertyChanged(nameof(RmlGuid)); + } + + } + + protected Rml _rml; + /// + /// Gets or sets the cct rml. + /// + + public virtual Rml Rml + { + get + { + return _rml; + } + + set + { + _rml = value; RaisePropertyChanged(nameof(Rml)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public Cct() : base() + { + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/ColorSpace.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/ColorSpace.cs new file mode 100644 index 000000000..79f1b5afd --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/ColorSpace.cs @@ -0,0 +1,104 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("COLOR_SPACES")] + public partial class ColorSpace : ObservableEntity + { + + protected Int32 _code; + /// + /// Gets or sets the colorspace code. + /// + [Column("CODE")] + + public Int32 Code + { + get + { + return _code; + } + + set + { + _code = value; RaisePropertyChanged(nameof(Code)); + } + + } + + protected String _name; + /// + /// Gets or sets the colorspace name. + /// + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected String _description; + /// + /// Gets or sets the colorspace description. + /// + [Column("DESCRIPTION")] + + public String Description + { + get + { + return _description; + } + + set + { + _description = value; RaisePropertyChanged(nameof(Description)); + } + + } + + protected ObservableCollection _brushstops; + /// + /// Gets or sets the colorspace brush stops. + /// + + public virtual ObservableCollection BrushStops + { + get + { + return _brushstops; + } + + set + { + _brushstops = value; RaisePropertyChanged(nameof(BrushStops)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public ColorSpace() : base() + { + + BrushStops = new ObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Configuration.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Configuration.cs new file mode 100644 index 000000000..fb993a36e --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Configuration.cs @@ -0,0 +1,420 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("CONFIGURATIONS")] + public partial class Configuration : ObservableEntity + { + + protected String _name; + /// + /// Gets or sets the configuration name. + /// + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected DateTime _creationdate; + /// + /// Gets or sets the configuration creation date. + /// + [Column("CREATION_DATE")] + + public DateTime CreationDate + { + get + { + return _creationdate; + } + + set + { + _creationdate = value; RaisePropertyChanged(nameof(CreationDate)); + } + + } + + protected String _applicationversionguid; + /// + /// Gets or sets the configuration application version guid. + /// + [Column("APPLICATION_VERSION_GUID")] + [ForeignKey("ApplicationVersion")] + public String ApplicationVersionGuid + { + get + { + return _applicationversionguid; + } + + set + { + _applicationversionguid = value; RaisePropertyChanged(nameof(ApplicationVersionGuid)); + } + + } + + protected String _applicationosversionguid; + /// + /// Gets or sets the configuration application os version guid. + /// + [Column("APPLICATION_OS_VERSION_GUID")] + [ForeignKey("ApplicationOsVersion")] + public String ApplicationOsVersionGuid + { + get + { + return _applicationosversionguid; + } + + set + { + _applicationosversionguid = value; RaisePropertyChanged(nameof(ApplicationOsVersionGuid)); + } + + } + + protected String _applicationfirmwareversionguid; + /// + /// Gets or sets the configuration application firmware version guid. + /// + [Column("APPLICATION_FIRMWARE_VERSION_GUID")] + [ForeignKey("ApplicationFirmwareVersion")] + public String ApplicationFirmwareVersionGuid + { + get + { + return _applicationfirmwareversionguid; + } + + set + { + _applicationfirmwareversionguid = value; RaisePropertyChanged(nameof(ApplicationFirmwareVersionGuid)); + } + + } + + protected String _applicationdisplaypanelversionguid; + /// + /// Gets or sets the configuration application display panel version guid. + /// + [Column("APPLICATION_DISPLAY_PANEL_VERSION_GUID")] + [ForeignKey("ApplicationDisplayPanelVersion")] + public String ApplicationDisplayPanelVersionGuid + { + get + { + return _applicationdisplaypanelversionguid; + } + + set + { + _applicationdisplaypanelversionguid = value; RaisePropertyChanged(nameof(ApplicationDisplayPanelVersionGuid)); + } + + } + + protected String _embeddedfirmwareversionguid; + /// + /// Gets or sets the configuration embedded firmware version guid. + /// + [Column("EMBEDDED_FIRMWARE_VERSION_GUID")] + [ForeignKey("EmbeddedFirmwareVersion")] + public String EmbeddedFirmwareVersionGuid + { + get + { + return _embeddedfirmwareversionguid; + } + + set + { + _embeddedfirmwareversionguid = value; RaisePropertyChanged(nameof(EmbeddedFirmwareVersionGuid)); + } + + } + + protected String _embeddedsoftwareversionguid; + /// + /// Gets or sets the configuration embedded software version guid. + /// + [Column("EMBEDDED_SOFTWARE_VERSION_GUID")] + [ForeignKey("EmbeddedSoftwareVersion")] + public String EmbeddedSoftwareVersionGuid + { + get + { + return _embeddedsoftwareversionguid; + } + + set + { + _embeddedsoftwareversionguid = value; RaisePropertyChanged(nameof(EmbeddedSoftwareVersionGuid)); + } + + } + + protected String _hardwareversionguid; + /// + /// Gets or sets the configuration hardware version guid. + /// + [Column("HARDWARE_VERSION_GUID")] + [ForeignKey("HardwareVersion")] + public String HardwareVersionGuid + { + get + { + return _hardwareversionguid; + } + + set + { + _hardwareversionguid = value; RaisePropertyChanged(nameof(HardwareVersionGuid)); + } + + } + + protected ApplicationDisplayPanelVersion _applicationdisplaypanelversion; + /// + /// Gets or sets the configuration application display panel versions. + /// + + public virtual ApplicationDisplayPanelVersion ApplicationDisplayPanelVersion + { + get + { + return _applicationdisplaypanelversion; + } + + set + { + _applicationdisplaypanelversion = value; RaisePropertyChanged(nameof(ApplicationDisplayPanelVersion)); + } + + } + + protected ApplicationFirmwareVersion _applicationfirmwareversion; + /// + /// Gets or sets the configuration application firmware versions. + /// + + public virtual ApplicationFirmwareVersion ApplicationFirmwareVersion + { + get + { + return _applicationfirmwareversion; + } + + set + { + _applicationfirmwareversion = value; RaisePropertyChanged(nameof(ApplicationFirmwareVersion)); + } + + } + + protected ApplicationOsVersion _applicationosversion; + /// + /// Gets or sets the configuration application os versions. + /// + + public virtual ApplicationOsVersion ApplicationOsVersion + { + get + { + return _applicationosversion; + } + + set + { + _applicationosversion = value; RaisePropertyChanged(nameof(ApplicationOsVersion)); + } + + } + + protected ApplicationVersion _applicationversion; + /// + /// Gets or sets the configuration application versions. + /// + + public virtual ApplicationVersion ApplicationVersion + { + get + { + return _applicationversion; + } + + set + { + _applicationversion = value; RaisePropertyChanged(nameof(ApplicationVersion)); + } + + } + + protected EmbeddedFirmwareVersion _embeddedfirmwareversion; + /// + /// Gets or sets the configuration embedded firmware versions. + /// + + public virtual EmbeddedFirmwareVersion EmbeddedFirmwareVersion + { + get + { + return _embeddedfirmwareversion; + } + + set + { + _embeddedfirmwareversion = value; RaisePropertyChanged(nameof(EmbeddedFirmwareVersion)); + } + + } + + protected EmbeddedSoftwareVersion _embeddedsoftwareversion; + /// + /// Gets or sets the configuration embedded software versions. + /// + + public virtual EmbeddedSoftwareVersion EmbeddedSoftwareVersion + { + get + { + return _embeddedsoftwareversion; + } + + set + { + _embeddedsoftwareversion = value; RaisePropertyChanged(nameof(EmbeddedSoftwareVersion)); + } + + } + + protected HardwareVersion _hardwareversion; + /// + /// Gets or sets the configuration hardware versions. + /// + + public virtual HardwareVersion HardwareVersion + { + get + { + return _hardwareversion; + } + + set + { + _hardwareversion = value; RaisePropertyChanged(nameof(HardwareVersion)); + } + + } + + protected ObservableCollection _idspacks; + /// + /// Gets or sets the configuration ids packs. + /// + + public virtual ObservableCollection IdsPacks + { + get + { + return _idspacks; + } + + set + { + _idspacks = value; RaisePropertyChanged(nameof(IdsPacks)); + } + + } + + protected ObservableCollection _machineversions; + /// + /// Gets or sets the configuration machine versions. + /// + + public virtual ObservableCollection MachineVersions + { + get + { + return _machineversions; + } + + set + { + _machineversions = value; RaisePropertyChanged(nameof(MachineVersions)); + } + + } + + protected ObservableCollection _machines; + /// + /// Gets or sets the configuration machines. + /// + + public virtual ObservableCollection Machines + { + get + { + return _machines; + } + + set + { + _machines = value; RaisePropertyChanged(nameof(Machines)); + } + + } + + protected ObservableCollection _machinesconfigurations; + /// + /// Gets or sets the configuration machines configurations. + /// + + public virtual ObservableCollection MachinesConfigurations + { + get + { + return _machinesconfigurations; + } + + set + { + _machinesconfigurations = value; RaisePropertyChanged(nameof(MachinesConfigurations)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public Configuration() : base() + { + + IdsPacks = new ObservableCollection(); + + MachineVersions = new ObservableCollection(); + + Machines = new ObservableCollection(); + + MachinesConfigurations = new ObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Contact.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Contact.cs new file mode 100644 index 000000000..78c44ba7f --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Contact.cs @@ -0,0 +1,205 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("CONTACTS")] + public partial class Contact : ObservableEntity + { + + protected Boolean _deleted; + /// + /// Gets or sets the contact deleted. + /// + [Column("DELETED")] + + public Boolean Deleted + { + get + { + return _deleted; + } + + set + { + _deleted = value; RaisePropertyChanged(nameof(Deleted)); + } + + } + + protected String _firstname; + /// + /// Gets or sets the contact first name. + /// + [Column("FIRST_NAME")] + + public String FirstName + { + get + { + return _firstname; + } + + set + { + _firstname = value; RaisePropertyChanged(nameof(FirstName)); + } + + } + + protected String _lastname; + /// + /// Gets or sets the contact last name. + /// + [Column("LAST_NAME")] + + public String LastName + { + get + { + return _lastname; + } + + set + { + _lastname = value; RaisePropertyChanged(nameof(LastName)); + } + + } + + protected String _fullname; + /// + /// Gets or sets the contact full name. + /// + [Column("FULL_NAME")] + + public String FullName + { + get + { + return _fullname; + } + + set + { + _fullname = value; RaisePropertyChanged(nameof(FullName)); + } + + } + + protected String _email; + /// + /// Gets or sets the contact email. + /// + [Column("EMAIL")] + + public String Email + { + get + { + return _email; + } + + set + { + _email = value; RaisePropertyChanged(nameof(Email)); + } + + } + + protected String _phonenumber; + /// + /// Gets or sets the contact phone number. + /// + [Column("PHONE_NUMBER")] + + public String PhoneNumber + { + get + { + return _phonenumber; + } + + set + { + _phonenumber = value; RaisePropertyChanged(nameof(PhoneNumber)); + } + + } + + protected String _fax; + /// + /// Gets or sets the contact fax. + /// + [Column("FAX")] + + public String Fax + { + get + { + return _fax; + } + + set + { + _fax = value; RaisePropertyChanged(nameof(Fax)); + } + + } + + protected ObservableCollection _organizations; + /// + /// Gets or sets the contact organizations. + /// + + public virtual ObservableCollection Organizations + { + get + { + return _organizations; + } + + set + { + _organizations = value; RaisePropertyChanged(nameof(Organizations)); + } + + } + + protected ObservableCollection _users; + /// + /// Gets or sets the contact users. + /// + + public virtual ObservableCollection Users + { + get + { + return _users; + } + + set + { + _users = value; RaisePropertyChanged(nameof(Users)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public Contact() : base() + { + + Organizations = new ObservableCollection(); + + Users = new ObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/DispenserType.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/DispenserType.cs new file mode 100644 index 000000000..12be3f9eb --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/DispenserType.cs @@ -0,0 +1,124 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("DISPENSER_TYPES")] + public partial class DispenserType : ObservableEntity + { + + protected Int32 _code; + /// + /// Gets or sets the dispensertype code. + /// + [Column("CODE")] + + public Int32 Code + { + get + { + return _code; + } + + set + { + _code = value; RaisePropertyChanged(nameof(Code)); + } + + } + + protected String _name; + /// + /// Gets or sets the dispensertype name. + /// + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected Double _nlperpulse; + /// + /// Gets or sets the dispensertype nl per pulse. + /// + [Column("NL_PER_PULSE")] + + public Double NlPerPulse + { + get + { + return _nlperpulse; + } + + set + { + _nlperpulse = value; RaisePropertyChanged(nameof(NlPerPulse)); + } + + } + + protected Double _capacity; + /// + /// Gets or sets the dispensertype capacity. + /// + [Column("CAPACITY")] + + public Double Capacity + { + get + { + return _capacity; + } + + set + { + _capacity = value; RaisePropertyChanged(nameof(Capacity)); + } + + } + + protected ObservableCollection _idspacks; + /// + /// Gets or sets the dispensertype ids packs. + /// + + public virtual ObservableCollection IdsPacks + { + get + { + return _idspacks; + } + + set + { + _idspacks = value; RaisePropertyChanged(nameof(IdsPacks)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public DispenserType() : base() + { + + IdsPacks = new ObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/EmbeddedFirmwareVersion.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/EmbeddedFirmwareVersion.cs new file mode 100644 index 000000000..bff60e190 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/EmbeddedFirmwareVersion.cs @@ -0,0 +1,84 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("EMBEDDED_FIRMWARE_VERSIONS")] + public partial class EmbeddedFirmwareVersion : ObservableEntity + { + + protected Double _version; + /// + /// Gets or sets the embeddedfirmwareversion version. + /// + [Column("VERSION")] + + public Double Version + { + get + { + return _version; + } + + set + { + _version = value; RaisePropertyChanged(nameof(Version)); + } + + } + + protected String _name; + /// + /// Gets or sets the embeddedfirmwareversion name. + /// + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected ObservableCollection _configurations; + /// + /// Gets or sets the embeddedfirmwareversion configurations. + /// + + public virtual ObservableCollection Configurations + { + get + { + return _configurations; + } + + set + { + _configurations = value; RaisePropertyChanged(nameof(Configurations)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public EmbeddedFirmwareVersion() : base() + { + + Configurations = new ObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/EmbeddedSoftwareVersion.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/EmbeddedSoftwareVersion.cs new file mode 100644 index 000000000..1f39794cf --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/EmbeddedSoftwareVersion.cs @@ -0,0 +1,84 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("EMBEDDED_SOFTWARE_VERSIONS")] + public partial class EmbeddedSoftwareVersion : ObservableEntity + { + + protected Double _version; + /// + /// Gets or sets the embeddedsoftwareversion version. + /// + [Column("VERSION")] + + public Double Version + { + get + { + return _version; + } + + set + { + _version = value; RaisePropertyChanged(nameof(Version)); + } + + } + + protected String _name; + /// + /// Gets or sets the embeddedsoftwareversion name. + /// + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected ObservableCollection _configurations; + /// + /// Gets or sets the embeddedsoftwareversion configurations. + /// + + public virtual ObservableCollection Configurations + { + get + { + return _configurations; + } + + set + { + _configurations = value; RaisePropertyChanged(nameof(Configurations)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public EmbeddedSoftwareVersion() : base() + { + + Configurations = new ObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/EventType.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/EventType.cs new file mode 100644 index 000000000..26e6c4ab4 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/EventType.cs @@ -0,0 +1,125 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("EVENT_TYPES")] + public partial class EventType : ObservableEntity + { + + protected Int32 _code; + /// + /// Gets or sets the eventtype code. + /// + [Column("CODE")] + + public Int32 Code + { + get + { + return _code; + } + + set + { + _code = value; RaisePropertyChanged(nameof(Code)); + } + + } + + protected String _name; + /// + /// Gets or sets the eventtype name. + /// + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected String _description; + /// + /// Gets or sets the eventtype description. + /// + [Column("DESCRIPTION")] + + public String Description + { + get + { + return _description; + } + + set + { + _description = value; RaisePropertyChanged(nameof(Description)); + } + + } + + protected ObservableCollection _eventtypesactions; + /// + /// Gets or sets the eventtype event types actions. + /// + + public virtual ObservableCollection EventTypesActions + { + get + { + return _eventtypesactions; + } + + set + { + _eventtypesactions = value; RaisePropertyChanged(nameof(EventTypesActions)); + } + + } + + protected ObservableCollection _machinesevents; + /// + /// Gets or sets the eventtype machines events. + /// + + public virtual ObservableCollection MachinesEvents + { + get + { + return _machinesevents; + } + + set + { + _machinesevents = value; RaisePropertyChanged(nameof(MachinesEvents)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public EventType() : base() + { + + EventTypesActions = new ObservableCollection(); + + MachinesEvents = new ObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/EventTypesAction.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/EventTypesAction.cs new file mode 100644 index 000000000..77da6e91b --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/EventTypesAction.cs @@ -0,0 +1,100 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("EVENT_TYPES_ACTIONS")] + public partial class EventTypesAction : ObservableEntity + { + + protected String _eventtypeguid; + /// + /// Gets or sets the eventtypesaction event type guid. + /// + [Column("EVENT_TYPE_GUID")] + [ForeignKey("EventType")] + public String EventTypeGuid + { + get + { + return _eventtypeguid; + } + + set + { + _eventtypeguid = value; RaisePropertyChanged(nameof(EventTypeGuid)); + } + + } + + protected String _actiontypeguid; + /// + /// Gets or sets the eventtypesaction action type guid. + /// + [Column("ACTION_TYPE_GUID")] + [ForeignKey("ActionType")] + public String ActionTypeGuid + { + get + { + return _actiontypeguid; + } + + set + { + _actiontypeguid = value; RaisePropertyChanged(nameof(ActionTypeGuid)); + } + + } + + protected ActionType _actiontype; + /// + /// Gets or sets the eventtypesaction action types. + /// + + public virtual ActionType ActionType + { + get + { + return _actiontype; + } + + set + { + _actiontype = value; RaisePropertyChanged(nameof(ActionType)); + } + + } + + protected EventType _eventtype; + /// + /// Gets or sets the eventtypesaction event types. + /// + + public virtual EventType EventType + { + get + { + return _eventtype; + } + + set + { + _eventtype = value; RaisePropertyChanged(nameof(EventType)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public EventTypesAction() : base() + { + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/FiberShape.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/FiberShape.cs new file mode 100644 index 000000000..088561b83 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/FiberShape.cs @@ -0,0 +1,84 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("FIBER_SHAPES")] + public partial class FiberShape : ObservableEntity + { + + protected String _name; + /// + /// Gets or sets the fibershape name. + /// + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected Int32 _code; + /// + /// Gets or sets the fibershape code. + /// + [Column("CODE")] + + public Int32 Code + { + get + { + return _code; + } + + set + { + _code = value; RaisePropertyChanged(nameof(Code)); + } + + } + + protected ObservableCollection _rmls; + /// + /// Gets or sets the fibershape rmls. + /// + + public virtual ObservableCollection Rmls + { + get + { + return _rmls; + } + + set + { + _rmls = value; RaisePropertyChanged(nameof(Rmls)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public FiberShape() : base() + { + + Rmls = new ObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/FiberSynth.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/FiberSynth.cs new file mode 100644 index 000000000..d5f1eaa0b --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/FiberSynth.cs @@ -0,0 +1,84 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("FIBER_SYNTHS")] + public partial class FiberSynth : ObservableEntity + { + + protected String _name; + /// + /// Gets or sets the fibersynth name. + /// + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected Int32 _code; + /// + /// Gets or sets the fibersynth code. + /// + [Column("CODE")] + + public Int32 Code + { + get + { + return _code; + } + + set + { + _code = value; RaisePropertyChanged(nameof(Code)); + } + + } + + protected ObservableCollection _rmls; + /// + /// Gets or sets the fibersynth rmls. + /// + + public virtual ObservableCollection Rmls + { + get + { + return _rmls; + } + + set + { + _rmls = value; RaisePropertyChanged(nameof(Rmls)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public FiberSynth() : base() + { + + Rmls = new ObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/HardwareVersion.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/HardwareVersion.cs new file mode 100644 index 000000000..033623160 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/HardwareVersion.cs @@ -0,0 +1,84 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("HARDWARE_VERSIONS")] + public partial class HardwareVersion : ObservableEntity + { + + protected Double _version; + /// + /// Gets or sets the hardwareversion version. + /// + [Column("VERSION")] + + public Double Version + { + get + { + return _version; + } + + set + { + _version = value; RaisePropertyChanged(nameof(Version)); + } + + } + + protected String _name; + /// + /// Gets or sets the hardwareversion name. + /// + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected ObservableCollection _configurations; + /// + /// Gets or sets the hardwareversion configurations. + /// + + public virtual ObservableCollection Configurations + { + get + { + return _configurations; + } + + set + { + _configurations = value; RaisePropertyChanged(nameof(Configurations)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public HardwareVersion() : base() + { + + Configurations = new ObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/IdsPack.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/IdsPack.cs new file mode 100644 index 000000000..6029fbf00 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/IdsPack.cs @@ -0,0 +1,296 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("IDS_PACKS")] + public partial class IdsPack : ObservableEntity + { + + protected String _configurationguid; + /// + /// Gets or sets the idspack configuration guid. + /// + [Column("CONFIGURATION_GUID")] + [ForeignKey("Configuration")] + public String ConfigurationGuid + { + get + { + return _configurationguid; + } + + set + { + _configurationguid = value; RaisePropertyChanged(nameof(ConfigurationGuid)); + } + + } + + protected String _dispensertypeguid; + /// + /// Gets or sets the idspack dispenser type guid. + /// + [Column("DISPENSER_TYPE_GUID")] + [ForeignKey("DispenserType")] + public String DispenserTypeGuid + { + get + { + return _dispensertypeguid; + } + + set + { + _dispensertypeguid = value; RaisePropertyChanged(nameof(DispenserTypeGuid)); + } + + } + + protected String _liquidtypeguid; + /// + /// Gets or sets the idspack liquid type guid. + /// + [Column("LIQUID_TYPE_GUID")] + [ForeignKey("LiquidType")] + public String LiquidTypeGuid + { + get + { + return _liquidtypeguid; + } + + set + { + _liquidtypeguid = value; RaisePropertyChanged(nameof(LiquidTypeGuid)); + } + + } + + protected String _cartridgetypeguid; + /// + /// Gets or sets the idspack cartridge type guid. + /// + [Column("CARTRIDGE_TYPE_GUID")] + [ForeignKey("CartridgeType")] + public String CartridgeTypeGuid + { + get + { + return _cartridgetypeguid; + } + + set + { + _cartridgetypeguid = value; RaisePropertyChanged(nameof(CartridgeTypeGuid)); + } + + } + + protected String _midtanktypeguid; + /// + /// Gets or sets the idspack mid tank type guid. + /// + [Column("MID_TANK_TYPE_GUID")] + [ForeignKey("MidTankType")] + public String MidTankTypeGuid + { + get + { + return _midtanktypeguid; + } + + set + { + _midtanktypeguid = value; RaisePropertyChanged(nameof(MidTankTypeGuid)); + } + + } + + protected String _name; + /// + /// Gets or sets the idspack name. + /// + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected Int32 _packindex; + /// + /// Gets or sets the idspack pack index. + /// + [Column("PACK_INDEX")] + + public Int32 PackIndex + { + get + { + return _packindex; + } + + set + { + _packindex = value; RaisePropertyChanged(nameof(PackIndex)); + } + + } + + protected String _idspackformulaguid; + /// + /// Gets or sets the idspack ids pack formula guid. + /// + [Column("IDS_PACK_FORMULA_GUID")] + [ForeignKey("IdsPackFormula")] + public String IdsPackFormulaGuid + { + get + { + return _idspackformulaguid; + } + + set + { + _idspackformulaguid = value; RaisePropertyChanged(nameof(IdsPackFormulaGuid)); + } + + } + + protected CartridgeType _cartridgetype; + /// + /// Gets or sets the idspack cartridge types. + /// + + public virtual CartridgeType CartridgeType + { + get + { + return _cartridgetype; + } + + set + { + _cartridgetype = value; RaisePropertyChanged(nameof(CartridgeType)); + } + + } + + protected Configuration _configuration; + /// + /// Gets or sets the idspack configuration. + /// + + public virtual Configuration Configuration + { + get + { + return _configuration; + } + + set + { + _configuration = value; RaisePropertyChanged(nameof(Configuration)); + } + + } + + protected DispenserType _dispensertype; + /// + /// Gets or sets the idspack dispenser types. + /// + + public virtual DispenserType DispenserType + { + get + { + return _dispensertype; + } + + set + { + _dispensertype = value; RaisePropertyChanged(nameof(DispenserType)); + } + + } + + protected IdsPackFormula _idspackformula; + /// + /// Gets or sets the idspack ids pack formulas. + /// + + public virtual IdsPackFormula IdsPackFormula + { + get + { + return _idspackformula; + } + + set + { + _idspackformula = value; RaisePropertyChanged(nameof(IdsPackFormula)); + } + + } + + protected LiquidType _liquidtype; + /// + /// Gets or sets the idspack liquid types. + /// + + public virtual LiquidType LiquidType + { + get + { + return _liquidtype; + } + + set + { + _liquidtype = value; RaisePropertyChanged(nameof(LiquidType)); + } + + } + + protected MidTankType _midtanktype; + /// + /// Gets or sets the idspack mid tank types. + /// + + public virtual MidTankType MidTankType + { + get + { + return _midtanktype; + } + + set + { + _midtanktype = value; RaisePropertyChanged(nameof(MidTankType)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public IdsPack() : base() + { + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/IdsPackFormula.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/IdsPackFormula.cs new file mode 100644 index 000000000..76be59dca --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/IdsPackFormula.cs @@ -0,0 +1,124 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("IDS_PACK_FORMULAS")] + public partial class IdsPackFormula : ObservableEntity + { + + protected Int32 _code; + /// + /// Gets or sets the idspackformula code. + /// + [Column("CODE")] + + public Int32 Code + { + get + { + return _code; + } + + set + { + _code = value; RaisePropertyChanged(nameof(Code)); + } + + } + + protected String _name; + /// + /// Gets or sets the idspackformula name. + /// + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected String _description; + /// + /// Gets or sets the idspackformula description. + /// + [Column("DESCRIPTION")] + + public String Description + { + get + { + return _description; + } + + set + { + _description = value; RaisePropertyChanged(nameof(Description)); + } + + } + + protected Boolean _autocalculated; + /// + /// Gets or sets the idspackformula auto calculated. + /// + [Column("AUTO_CALCULATED")] + + public Boolean AutoCalculated + { + get + { + return _autocalculated; + } + + set + { + _autocalculated = value; RaisePropertyChanged(nameof(AutoCalculated)); + } + + } + + protected ObservableCollection _idspacks; + /// + /// Gets or sets the idspackformula ids packs. + /// + + public virtual ObservableCollection IdsPacks + { + get + { + return _idspacks; + } + + set + { + _idspacks = value; RaisePropertyChanged(nameof(IdsPacks)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public IdsPackFormula() : base() + { + + IdsPacks = new ObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Job.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Job.cs new file mode 100644 index 000000000..bf33c8b07 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Job.cs @@ -0,0 +1,302 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("JOBS")] + public partial class Job : ObservableEntity + { + + protected DateTime _creationdate; + /// + /// Gets or sets the job creation date. + /// + [Column("CREATION_DATE")] + + public DateTime CreationDate + { + get + { + return _creationdate; + } + + set + { + _creationdate = value; RaisePropertyChanged(nameof(CreationDate)); + } + + } + + protected String _machineguid; + /// + /// Gets or sets the job machine guid. + /// + [Column("MACHINE_GUID")] + [ForeignKey("Machine")] + public String MachineGuid + { + get + { + return _machineguid; + } + + set + { + _machineguid = value; RaisePropertyChanged(nameof(MachineGuid)); + } + + } + + protected String _rmlguid; + /// + /// Gets or sets the job rml guid. + /// + [Column("RML_GUID")] + [ForeignKey("Rml")] + public String RmlGuid + { + get + { + return _rmlguid; + } + + set + { + _rmlguid = value; RaisePropertyChanged(nameof(RmlGuid)); + } + + } + + protected String _windingmethodguid; + /// + /// Gets or sets the job winding method guid. + /// + [Column("WINDING_METHOD_GUID")] + [ForeignKey("WindingMethod")] + public String WindingMethodGuid + { + get + { + return _windingmethodguid; + } + + set + { + _windingmethodguid = value; RaisePropertyChanged(nameof(WindingMethodGuid)); + } + + } + + protected String _name; + /// + /// Gets or sets the job name. + /// + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected String _description; + /// + /// Gets or sets the job description. + /// + [Column("DESCRIPTION")] + + public String Description + { + get + { + return _description; + } + + set + { + _description = value; RaisePropertyChanged(nameof(Description)); + } + + } + + protected Double _intersegmentlength; + /// + /// Gets or sets the job inter segment length. + /// + [Column("INTER_SEGMENT_LENGTH")] + + public Double InterSegmentLength + { + get + { + return _intersegmentlength; + } + + set + { + _intersegmentlength = value; RaisePropertyChanged(nameof(InterSegmentLength)); + } + + } + + protected Boolean _enableintersegment; + /// + /// Gets or sets the job enable inter segment. + /// + [Column("ENABLE_INTER_SEGMENT")] + + public Boolean EnableInterSegment + { + get + { + return _enableintersegment; + } + + set + { + _enableintersegment = value; RaisePropertyChanged(nameof(EnableInterSegment)); + } + + } + + protected Boolean _enablelubrication; + /// + /// Gets or sets the job enable lubrication. + /// + [Column("ENABLE_LUBRICATION")] + + public Boolean EnableLubrication + { + get + { + return _enablelubrication; + } + + set + { + _enablelubrication = value; RaisePropertyChanged(nameof(EnableLubrication)); + } + + } + + protected ObservableCollection _jobruns; + /// + /// Gets or sets the job job runs. + /// + + public virtual ObservableCollection JobRuns + { + get + { + return _jobruns; + } + + set + { + _jobruns = value; RaisePropertyChanged(nameof(JobRuns)); + } + + } + + protected Machine _machine; + /// + /// Gets or sets the job machine. + /// + + public virtual Machine Machine + { + get + { + return _machine; + } + + set + { + _machine = value; RaisePropertyChanged(nameof(Machine)); + } + + } + + protected Rml _rml; + /// + /// Gets or sets the job rml. + /// + + public virtual Rml Rml + { + get + { + return _rml; + } + + set + { + _rml = value; RaisePropertyChanged(nameof(Rml)); + } + + } + + protected WindingMethod _windingmethod; + /// + /// Gets or sets the job winding methods. + /// + + public virtual WindingMethod WindingMethod + { + get + { + return _windingmethod; + } + + set + { + _windingmethod = value; RaisePropertyChanged(nameof(WindingMethod)); + } + + } + + protected ObservableCollection _segments; + /// + /// Gets or sets the job segments. + /// + + public virtual ObservableCollection Segments + { + get + { + return _segments; + } + + set + { + _segments = value; RaisePropertyChanged(nameof(Segments)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public Job() : base() + { + + JobRuns = new ObservableCollection(); + + Segments = new ObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/JobRun.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/JobRun.cs new file mode 100644 index 000000000..2d795b0b5 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/JobRun.cs @@ -0,0 +1,121 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("JOB_RUNS")] + public partial class JobRun : ObservableEntity + { + + protected String _jobguid; + /// + /// Gets or sets the jobrun job guid. + /// + [Column("JOB_GUID")] + [ForeignKey("Job")] + public String JobGuid + { + get + { + return _jobguid; + } + + set + { + _jobguid = value; RaisePropertyChanged(nameof(JobGuid)); + } + + } + + protected DateTime _startdate; + /// + /// Gets or sets the jobrun start date. + /// + [Column("START_DATE")] + + public DateTime StartDate + { + get + { + return _startdate; + } + + set + { + _startdate = value; RaisePropertyChanged(nameof(StartDate)); + } + + } + + protected DateTime _enddate; + /// + /// Gets or sets the jobrun end date. + /// + [Column("END_DATE")] + + public DateTime EndDate + { + get + { + return _enddate; + } + + set + { + _enddate = value; RaisePropertyChanged(nameof(EndDate)); + } + + } + + protected Boolean _successful; + /// + /// Gets or sets the jobrun successful. + /// + [Column("SUCCESSFUL")] + + public Boolean Successful + { + get + { + return _successful; + } + + set + { + _successful = value; RaisePropertyChanged(nameof(Successful)); + } + + } + + protected Job _job; + /// + /// Gets or sets the jobrun job. + /// + + public virtual Job Job + { + get + { + return _job; + } + + set + { + _job = value; RaisePropertyChanged(nameof(Job)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public JobRun() : base() + { + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/LinearMassDensityUnit.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/LinearMassDensityUnit.cs new file mode 100644 index 000000000..6fcf7e0f3 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/LinearMassDensityUnit.cs @@ -0,0 +1,84 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("LINEAR_MASS_DENSITY_UNITS")] + public partial class LinearMassDensityUnit : ObservableEntity + { + + protected String _name; + /// + /// Gets or sets the linearmassdensityunit name. + /// + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected Int32 _code; + /// + /// Gets or sets the linearmassdensityunit code. + /// + [Column("CODE")] + + public Int32 Code + { + get + { + return _code; + } + + set + { + _code = value; RaisePropertyChanged(nameof(Code)); + } + + } + + protected ObservableCollection _rmls; + /// + /// Gets or sets the linearmassdensityunit rmls. + /// + + public virtual ObservableCollection Rmls + { + get + { + return _rmls; + } + + set + { + _rmls = value; RaisePropertyChanged(nameof(Rmls)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public LinearMassDensityUnit() : base() + { + + Rmls = new ObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/LiquidType.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/LiquidType.cs new file mode 100644 index 000000000..8c885d099 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/LiquidType.cs @@ -0,0 +1,166 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("LIQUID_TYPES")] + public partial class LiquidType : ObservableEntity + { + + protected Int32 _code; + /// + /// Gets or sets the liquidtype code. + /// + [Column("CODE")] + + public Int32 Code + { + get + { + return _code; + } + + set + { + _code = value; RaisePropertyChanged(nameof(Code)); + } + + } + + protected String _name; + /// + /// Gets or sets the liquidtype name. + /// + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected Double _version; + /// + /// Gets or sets the liquidtype version. + /// + [Column("VERSION")] + + public Double Version + { + get + { + return _version; + } + + set + { + _version = value; RaisePropertyChanged(nameof(Version)); + } + + } + + protected Int32 _color; + /// + /// Gets or sets the liquidtype color. + /// + [Column("COLOR")] + + public Int32 Color + { + get + { + return _color; + } + + set + { + _color = value; RaisePropertyChanged(nameof(Color)); + } + + } + + protected ObservableCollection _cats; + /// + /// Gets or sets the liquidtype cats. + /// + + public virtual ObservableCollection Cats + { + get + { + return _cats; + } + + set + { + _cats = value; RaisePropertyChanged(nameof(Cats)); + } + + } + + protected ObservableCollection _idspacks; + /// + /// Gets or sets the liquidtype ids packs. + /// + + public virtual ObservableCollection IdsPacks + { + get + { + return _idspacks; + } + + set + { + _idspacks = value; RaisePropertyChanged(nameof(IdsPacks)); + } + + } + + protected ObservableCollection _liquidtypesrmls; + /// + /// Gets or sets the liquidtype liquid types rmls. + /// + + public virtual ObservableCollection LiquidTypesRmls + { + get + { + return _liquidtypesrmls; + } + + set + { + _liquidtypesrmls = value; RaisePropertyChanged(nameof(LiquidTypesRmls)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public LiquidType() : base() + { + + Cats = new ObservableCollection(); + + IdsPacks = new ObservableCollection(); + + LiquidTypesRmls = new ObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/LiquidTypesRml.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/LiquidTypesRml.cs new file mode 100644 index 000000000..4002afa64 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/LiquidTypesRml.cs @@ -0,0 +1,120 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("LIQUID_TYPES_RMLS")] + public partial class LiquidTypesRml : ObservableEntity + { + + protected String _liquidtypeguid; + /// + /// Gets or sets the liquidtypesrml liquid type guid. + /// + [Column("LIQUID_TYPE_GUID")] + [ForeignKey("LiquidType")] + public String LiquidTypeGuid + { + get + { + return _liquidtypeguid; + } + + set + { + _liquidtypeguid = value; RaisePropertyChanged(nameof(LiquidTypeGuid)); + } + + } + + protected String _rmlguid; + /// + /// Gets or sets the liquidtypesrml rml guid. + /// + [Column("RML_GUID")] + [ForeignKey("Rml")] + public String RmlGuid + { + get + { + return _rmlguid; + } + + set + { + _rmlguid = value; RaisePropertyChanged(nameof(RmlGuid)); + } + + } + + protected Double _maxnlpercm; + /// + /// Gets or sets the liquidtypesrml max nl per cm. + /// + [Column("MAX_NL_PER_CM")] + + public Double MaxNlPerCm + { + get + { + return _maxnlpercm; + } + + set + { + _maxnlpercm = value; RaisePropertyChanged(nameof(MaxNlPerCm)); + } + + } + + protected LiquidType _liquidtype; + /// + /// Gets or sets the liquidtypesrml liquid types. + /// + + public virtual LiquidType LiquidType + { + get + { + return _liquidtype; + } + + set + { + _liquidtype = value; RaisePropertyChanged(nameof(LiquidType)); + } + + } + + protected Rml _rml; + /// + /// Gets or sets the liquidtypesrml rml. + /// + + public virtual Rml Rml + { + get + { + return _rml; + } + + set + { + _rml = value; RaisePropertyChanged(nameof(Rml)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public LiquidTypesRml() : base() + { + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Machine.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Machine.cs new file mode 100644 index 000000000..fea07023f --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Machine.cs @@ -0,0 +1,263 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("MACHINES")] + public partial class Machine : ObservableEntity + { + + protected String _serialnumber; + /// + /// Gets or sets the machine serial number. + /// + [Column("SERIAL_NUMBER")] + + public String SerialNumber + { + get + { + return _serialnumber; + } + + set + { + _serialnumber = value; RaisePropertyChanged(nameof(SerialNumber)); + } + + } + + protected String _name; + /// + /// Gets or sets the machine name. + /// + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected DateTime _productiondate; + /// + /// Gets or sets the machine production date. + /// + [Column("PRODUCTION_DATE")] + + public DateTime ProductionDate + { + get + { + return _productiondate; + } + + set + { + _productiondate = value; RaisePropertyChanged(nameof(ProductionDate)); + } + + } + + protected String _organizationguid; + /// + /// Gets or sets the machine organization guid. + /// + [Column("ORGANIZATION_GUID")] + [ForeignKey("Organization")] + public String OrganizationGuid + { + get + { + return _organizationguid; + } + + set + { + _organizationguid = value; RaisePropertyChanged(nameof(OrganizationGuid)); + } + + } + + protected String _machineversionguid; + /// + /// Gets or sets the machine machine version guid. + /// + [Column("MACHINE_VERSION_GUID")] + [ForeignKey("MachineVersion")] + public String MachineVersionGuid + { + get + { + return _machineversionguid; + } + + set + { + _machineversionguid = value; RaisePropertyChanged(nameof(MachineVersionGuid)); + } + + } + + protected String _configurationguid; + /// + /// Gets or sets the machine configuration guid. + /// + [Column("CONFIGURATION_GUID")] + [ForeignKey("Configuration")] + public String ConfigurationGuid + { + get + { + return _configurationguid; + } + + set + { + _configurationguid = value; RaisePropertyChanged(nameof(ConfigurationGuid)); + } + + } + + protected Configuration _configuration; + /// + /// Gets or sets the machine configuration. + /// + + public virtual Configuration Configuration + { + get + { + return _configuration; + } + + set + { + _configuration = value; RaisePropertyChanged(nameof(Configuration)); + } + + } + + protected ObservableCollection _jobs; + /// + /// Gets or sets the machine jobs. + /// + + public virtual ObservableCollection Jobs + { + get + { + return _jobs; + } + + set + { + _jobs = value; RaisePropertyChanged(nameof(Jobs)); + } + + } + + protected MachineVersion _machineversion; + /// + /// Gets or sets the machine machine versions. + /// + + public virtual MachineVersion MachineVersion + { + get + { + return _machineversion; + } + + set + { + _machineversion = value; RaisePropertyChanged(nameof(MachineVersion)); + } + + } + + protected ObservableCollection _machinesconfigurations; + /// + /// Gets or sets the machine machines configurations. + /// + + public virtual ObservableCollection MachinesConfigurations + { + get + { + return _machinesconfigurations; + } + + set + { + _machinesconfigurations = value; RaisePropertyChanged(nameof(MachinesConfigurations)); + } + + } + + protected ObservableCollection _machinesevents; + /// + /// Gets or sets the machine machines events. + /// + + public virtual ObservableCollection MachinesEvents + { + get + { + return _machinesevents; + } + + set + { + _machinesevents = value; RaisePropertyChanged(nameof(MachinesEvents)); + } + + } + + protected Organization _organization; + /// + /// Gets or sets the machine organization. + /// + + public virtual Organization Organization + { + get + { + return _organization; + } + + set + { + _organization = value; RaisePropertyChanged(nameof(Organization)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public Machine() : base() + { + + Jobs = new ObservableCollection(); + + MachinesConfigurations = new ObservableCollection(); + + MachinesEvents = new ObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/MachineVersion.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/MachineVersion.cs new file mode 100644 index 000000000..fc7184be1 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/MachineVersion.cs @@ -0,0 +1,123 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("MACHINE_VERSIONS")] + public partial class MachineVersion : ObservableEntity + { + + protected Double _version; + /// + /// Gets or sets the machineversion version. + /// + [Column("VERSION")] + + public Double Version + { + get + { + return _version; + } + + set + { + _version = value; RaisePropertyChanged(nameof(Version)); + } + + } + + protected String _name; + /// + /// Gets or sets the machineversion name. + /// + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected String _defaultconfigurationguid; + /// + /// Gets or sets the machineversion default configuration guid. + /// + [Column("DEFAULT_CONFIGURATION_GUID")] + [ForeignKey("DefaultConfiguration")] + public String DefaultConfigurationGuid + { + get + { + return _defaultconfigurationguid; + } + + set + { + _defaultconfigurationguid = value; RaisePropertyChanged(nameof(DefaultConfigurationGuid)); + } + + } + + protected Configuration _defaultconfiguration; + /// + /// Gets or sets the machineversion configuration. + /// + + public virtual Configuration DefaultConfiguration + { + get + { + return _defaultconfiguration; + } + + set + { + _defaultconfiguration = value; RaisePropertyChanged(nameof(DefaultConfiguration)); + } + + } + + protected ObservableCollection _machines; + /// + /// Gets or sets the machineversion machines. + /// + + public virtual ObservableCollection Machines + { + get + { + return _machines; + } + + set + { + _machines = value; RaisePropertyChanged(nameof(Machines)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public MachineVersion() : base() + { + + Machines = new ObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/MachinesConfiguration.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/MachinesConfiguration.cs new file mode 100644 index 000000000..de79ac7af --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/MachinesConfiguration.cs @@ -0,0 +1,100 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("MACHINES_CONFIGURATIONS")] + public partial class MachinesConfiguration : ObservableEntity + { + + protected String _machineguid; + /// + /// Gets or sets the machinesconfiguration machine guid. + /// + [Column("MACHINE_GUID")] + [ForeignKey("Machine")] + public String MachineGuid + { + get + { + return _machineguid; + } + + set + { + _machineguid = value; RaisePropertyChanged(nameof(MachineGuid)); + } + + } + + protected String _configurationguid; + /// + /// Gets or sets the machinesconfiguration configuration guid. + /// + [Column("CONFIGURATION_GUID")] + [ForeignKey("Configuration")] + public String ConfigurationGuid + { + get + { + return _configurationguid; + } + + set + { + _configurationguid = value; RaisePropertyChanged(nameof(ConfigurationGuid)); + } + + } + + protected Configuration _configuration; + /// + /// Gets or sets the machinesconfiguration configuration. + /// + + public virtual Configuration Configuration + { + get + { + return _configuration; + } + + set + { + _configuration = value; RaisePropertyChanged(nameof(Configuration)); + } + + } + + protected Machine _machine; + /// + /// Gets or sets the machinesconfiguration machine. + /// + + public virtual Machine Machine + { + get + { + return _machine; + } + + set + { + _machine = value; RaisePropertyChanged(nameof(Machine)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public MachinesConfiguration() : base() + { + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/MachinesEvent.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/MachinesEvent.cs new file mode 100644 index 000000000..cc4ad8961 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/MachinesEvent.cs @@ -0,0 +1,179 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("MACHINES_EVENTS")] + public partial class MachinesEvent : ObservableEntity + { + + protected String _machineguid; + /// + /// Gets or sets the machinesevent machine guid. + /// + [Column("MACHINE_GUID")] + [ForeignKey("Machine")] + public String MachineGuid + { + get + { + return _machineguid; + } + + set + { + _machineguid = value; RaisePropertyChanged(nameof(MachineGuid)); + } + + } + + protected String _eventtypeguid; + /// + /// Gets or sets the machinesevent event type guid. + /// + [Column("EVENT_TYPE_GUID")] + [ForeignKey("EventType")] + public String EventTypeGuid + { + get + { + return _eventtypeguid; + } + + set + { + _eventtypeguid = value; RaisePropertyChanged(nameof(EventTypeGuid)); + } + + } + + protected String _userguid; + /// + /// Gets or sets the machinesevent user guid. + /// + [Column("USER_GUID")] + [ForeignKey("User")] + public String UserGuid + { + get + { + return _userguid; + } + + set + { + _userguid = value; RaisePropertyChanged(nameof(UserGuid)); + } + + } + + protected DateTime _datetime; + /// + /// Gets or sets the machinesevent date time. + /// + [Column("DATE_TIME")] + + public DateTime DateTime + { + get + { + return _datetime; + } + + set + { + _datetime = value; RaisePropertyChanged(nameof(DateTime)); + } + + } + + protected String _description; + /// + /// Gets or sets the machinesevent description. + /// + [Column("DESCRIPTION")] + + public String Description + { + get + { + return _description; + } + + set + { + _description = value; RaisePropertyChanged(nameof(Description)); + } + + } + + protected EventType _eventtype; + /// + /// Gets or sets the machinesevent event types. + /// + + public virtual EventType EventType + { + get + { + return _eventtype; + } + + set + { + _eventtype = value; RaisePropertyChanged(nameof(EventType)); + } + + } + + protected Machine _machine; + /// + /// Gets or sets the machinesevent machine. + /// + + public virtual Machine Machine + { + get + { + return _machine; + } + + set + { + _machine = value; RaisePropertyChanged(nameof(Machine)); + } + + } + + protected User _user; + /// + /// Gets or sets the machinesevent user. + /// + + public virtual User User + { + get + { + return _user; + } + + set + { + _user = value; RaisePropertyChanged(nameof(User)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public MachinesEvent() : base() + { + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/MediaColor.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/MediaColor.cs new file mode 100644 index 000000000..36e4108e5 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/MediaColor.cs @@ -0,0 +1,64 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("MEDIA_COLORS")] + public partial class MediaColor : ObservableEntity + { + + protected Int32 _color; + /// + /// Gets or sets the mediacolor color. + /// + [Column("COLOR")] + + public Int32 Color + { + get + { + return _color; + } + + set + { + _color = value; RaisePropertyChanged(nameof(Color)); + } + + } + + protected ObservableCollection _rmls; + /// + /// Gets or sets the mediacolor rmls. + /// + + public virtual ObservableCollection Rmls + { + get + { + return _rmls; + } + + set + { + _rmls = value; RaisePropertyChanged(nameof(Rmls)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public MediaColor() : base() + { + + Rmls = new ObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/MediaCondition.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/MediaCondition.cs new file mode 100644 index 000000000..936c0170a --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/MediaCondition.cs @@ -0,0 +1,84 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("MEDIA_CONDITIONS")] + public partial class MediaCondition : ObservableEntity + { + + protected String _name; + /// + /// Gets or sets the mediacondition name. + /// + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected Int32 _code; + /// + /// Gets or sets the mediacondition code. + /// + [Column("CODE")] + + public Int32 Code + { + get + { + return _code; + } + + set + { + _code = value; RaisePropertyChanged(nameof(Code)); + } + + } + + protected ObservableCollection _rmls; + /// + /// Gets or sets the mediacondition rmls. + /// + + public virtual ObservableCollection Rmls + { + get + { + return _rmls; + } + + set + { + _rmls = value; RaisePropertyChanged(nameof(Rmls)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public MediaCondition() : base() + { + + Rmls = new ObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/MediaMaterial.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/MediaMaterial.cs new file mode 100644 index 000000000..beb27e9ea --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/MediaMaterial.cs @@ -0,0 +1,84 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("MEDIA_MATERIALS")] + public partial class MediaMaterial : ObservableEntity + { + + protected String _name; + /// + /// Gets or sets the mediamaterial name. + /// + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected Int32 _code; + /// + /// Gets or sets the mediamaterial code. + /// + [Column("CODE")] + + public Int32 Code + { + get + { + return _code; + } + + set + { + _code = value; RaisePropertyChanged(nameof(Code)); + } + + } + + protected ObservableCollection _rmls; + /// + /// Gets or sets the mediamaterial rmls. + /// + + public virtual ObservableCollection Rmls + { + get + { + return _rmls; + } + + set + { + _rmls = value; RaisePropertyChanged(nameof(Rmls)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public MediaMaterial() : base() + { + + Rmls = new ObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/MediaPurpos.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/MediaPurpos.cs new file mode 100644 index 000000000..43448504a --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/MediaPurpos.cs @@ -0,0 +1,84 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("MEDIA_PURPOSES")] + public partial class MediaPurpos : ObservableEntity + { + + protected String _name; + /// + /// Gets or sets the mediapurpos name. + /// + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected Int32 _code; + /// + /// Gets or sets the mediapurpos code. + /// + [Column("CODE")] + + public Int32 Code + { + get + { + return _code; + } + + set + { + _code = value; RaisePropertyChanged(nameof(Code)); + } + + } + + protected ObservableCollection _rmls; + /// + /// Gets or sets the mediapurpos rmls. + /// + + public virtual ObservableCollection Rmls + { + get + { + return _rmls; + } + + set + { + _rmls = value; RaisePropertyChanged(nameof(Rmls)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public MediaPurpos() : base() + { + + Rmls = new ObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/MidTankType.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/MidTankType.cs new file mode 100644 index 000000000..a68d18241 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/MidTankType.cs @@ -0,0 +1,104 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("MID_TANK_TYPES")] + public partial class MidTankType : ObservableEntity + { + + protected Int32 _code; + /// + /// Gets or sets the midtanktype code. + /// + [Column("CODE")] + + public Int32 Code + { + get + { + return _code; + } + + set + { + _code = value; RaisePropertyChanged(nameof(Code)); + } + + } + + protected String _name; + /// + /// Gets or sets the midtanktype name. + /// + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected Double _litercapacity; + /// + /// Gets or sets the midtanktype liter capacity. + /// + [Column("LITER_CAPACITY")] + + public Double LiterCapacity + { + get + { + return _litercapacity; + } + + set + { + _litercapacity = value; RaisePropertyChanged(nameof(LiterCapacity)); + } + + } + + protected ObservableCollection _idspacks; + /// + /// Gets or sets the midtanktype ids packs. + /// + + public virtual ObservableCollection IdsPacks + { + get + { + return _idspacks; + } + + set + { + _idspacks = value; RaisePropertyChanged(nameof(IdsPacks)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public MidTankType() : base() + { + + IdsPacks = new ObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Organization.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Organization.cs new file mode 100644 index 000000000..ca43cf4ed --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Organization.cs @@ -0,0 +1,163 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("ORGANIZATIONS")] + public partial class Organization : ObservableEntity + { + + protected String _name; + /// + /// Gets or sets the organization name. + /// + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected String _contactguid; + /// + /// Gets or sets the organization contact guid. + /// + [Column("CONTACT_GUID")] + [ForeignKey("Contact")] + public String ContactGuid + { + get + { + return _contactguid; + } + + set + { + _contactguid = value; RaisePropertyChanged(nameof(ContactGuid)); + } + + } + + protected String _addressguid; + /// + /// Gets or sets the organization address guid. + /// + [Column("ADDRESS_GUID")] + [ForeignKey("Address")] + public String AddressGuid + { + get + { + return _addressguid; + } + + set + { + _addressguid = value; RaisePropertyChanged(nameof(AddressGuid)); + } + + } + + protected Address _address; + /// + /// Gets or sets the organization address. + /// + + public virtual Address Address + { + get + { + return _address; + } + + set + { + _address = value; RaisePropertyChanged(nameof(Address)); + } + + } + + protected Contact _contact; + /// + /// Gets or sets the organization contact. + /// + + public virtual Contact Contact + { + get + { + return _contact; + } + + set + { + _contact = value; RaisePropertyChanged(nameof(Contact)); + } + + } + + protected ObservableCollection _machines; + /// + /// Gets or sets the organization machines. + /// + + public virtual ObservableCollection Machines + { + get + { + return _machines; + } + + set + { + _machines = value; RaisePropertyChanged(nameof(Machines)); + } + + } + + protected ObservableCollection _users; + /// + /// Gets or sets the organization users. + /// + + public virtual ObservableCollection Users + { + get + { + return _users; + } + + set + { + _users = value; RaisePropertyChanged(nameof(Users)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public Organization() : base() + { + + Machines = new ObservableCollection(); + + Users = new ObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Permission.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Permission.cs new file mode 100644 index 000000000..c9c21d7ac --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Permission.cs @@ -0,0 +1,104 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("PERMISSIONS")] + public partial class Permission : ObservableEntity + { + + protected Int32 _code; + /// + /// Gets or sets the permission code. + /// + [Column("CODE")] + + public Int32 Code + { + get + { + return _code; + } + + set + { + _code = value; RaisePropertyChanged(nameof(Code)); + } + + } + + protected String _name; + /// + /// Gets or sets the permission name. + /// + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected String _description; + /// + /// Gets or sets the permission description. + /// + [Column("DESCRIPTION")] + + public String Description + { + get + { + return _description; + } + + set + { + _description = value; RaisePropertyChanged(nameof(Description)); + } + + } + + protected ObservableCollection _rolespermissions; + /// + /// Gets or sets the permission roles permissions. + /// + + public virtual ObservableCollection RolesPermissions + { + get + { + return _rolespermissions; + } + + set + { + _rolespermissions = value; RaisePropertyChanged(nameof(RolesPermissions)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public Permission() : base() + { + + RolesPermissions = new ObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/ProcessParametersTable.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/ProcessParametersTable.cs new file mode 100644 index 000000000..1ec09b848 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/ProcessParametersTable.cs @@ -0,0 +1,401 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("PROCESS_PARAMETERS_TABLES")] + public partial class ProcessParametersTable : ObservableEntity + { + + protected String _name; + /// + /// Gets or sets the processparameterstable name. + /// + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected Double _dyeingspeed; + /// + /// Gets or sets the processparameterstable dyeing speed. + /// + [Column("DYEING_SPEED")] + + public Double DyeingSpeed + { + get + { + return _dyeingspeed; + } + + set + { + _dyeingspeed = value; RaisePropertyChanged(nameof(DyeingSpeed)); + } + + } + + protected Double _mininkuptake; + /// + /// Gets or sets the processparameterstable min ink uptake. + /// + [Column("MIN_INK_UPTAKE")] + + public Double MinInkUptake + { + get + { + return _mininkuptake; + } + + set + { + _mininkuptake = value; RaisePropertyChanged(nameof(MinInkUptake)); + } + + } + + protected Double _mixertemp; + /// + /// Gets or sets the processparameterstable mixer temp. + /// + [Column("MIXER_TEMP")] + + public Double MixerTemp + { + get + { + return _mixertemp; + } + + set + { + _mixertemp = value; RaisePropertyChanged(nameof(MixerTemp)); + } + + } + + protected Double _headzone1temp; + /// + /// Gets or sets the processparameterstable head zone1 temp. + /// + [Column("HEAD_ZONE1_TEMP")] + + public Double HeadZone1Temp + { + get + { + return _headzone1temp; + } + + set + { + _headzone1temp = value; RaisePropertyChanged(nameof(HeadZone1Temp)); + } + + } + + protected Double _headzone2temp; + /// + /// Gets or sets the processparameterstable head zone2 temp. + /// + [Column("HEAD_ZONE2_TEMP")] + + public Double HeadZone2Temp + { + get + { + return _headzone2temp; + } + + set + { + _headzone2temp = value; RaisePropertyChanged(nameof(HeadZone2Temp)); + } + + } + + protected Double _headzone3temp; + /// + /// Gets or sets the processparameterstable head zone3 temp. + /// + [Column("HEAD_ZONE3_TEMP")] + + public Double HeadZone3Temp + { + get + { + return _headzone3temp; + } + + set + { + _headzone3temp = value; RaisePropertyChanged(nameof(HeadZone3Temp)); + } + + } + + protected Double _headairflow; + /// + /// Gets or sets the processparameterstable head air flow. + /// + [Column("HEAD_AIR_FLOW")] + + public Double HeadAirFlow + { + get + { + return _headairflow; + } + + set + { + _headairflow = value; RaisePropertyChanged(nameof(HeadAirFlow)); + } + + } + + protected Double _feedertension; + /// + /// Gets or sets the processparameterstable feeder tension. + /// + [Column("FEEDER_TENSION")] + + public Double FeederTension + { + get + { + return _feedertension; + } + + set + { + _feedertension = value; RaisePropertyChanged(nameof(FeederTension)); + } + + } + + protected Double _pullertension; + /// + /// Gets or sets the processparameterstable puller tension. + /// + [Column("PULLER_TENSION")] + + public Double PullerTension + { + get + { + return _pullertension; + } + + set + { + _pullertension = value; RaisePropertyChanged(nameof(PullerTension)); + } + + } + + protected Double _dryerbufferlength; + /// + /// Gets or sets the processparameterstable dryer buffer length. + /// + [Column("DRYER_BUFFER_LENGTH")] + + public Double DryerBufferLength + { + get + { + return _dryerbufferlength; + } + + set + { + _dryerbufferlength = value; RaisePropertyChanged(nameof(DryerBufferLength)); + } + + } + + protected Double _dryerzone1temp; + /// + /// Gets or sets the processparameterstable dryer zone1 temp. + /// + [Column("DRYER_ZONE1_TEMP")] + + public Double DryerZone1Temp + { + get + { + return _dryerzone1temp; + } + + set + { + _dryerzone1temp = value; RaisePropertyChanged(nameof(DryerZone1Temp)); + } + + } + + protected Double _dryerzone2temp; + /// + /// Gets or sets the processparameterstable dryer zone2 temp. + /// + [Column("DRYER_ZONE2_TEMP")] + + public Double DryerZone2Temp + { + get + { + return _dryerzone2temp; + } + + set + { + _dryerzone2temp = value; RaisePropertyChanged(nameof(DryerZone2Temp)); + } + + } + + protected Double _dryerzone3temp; + /// + /// Gets or sets the processparameterstable dryer zone3 temp. + /// + [Column("DRYER_ZONE3_TEMP")] + + public Double DryerZone3Temp + { + get + { + return _dryerzone3temp; + } + + set + { + _dryerzone3temp = value; RaisePropertyChanged(nameof(DryerZone3Temp)); + } + + } + + protected Double _dryerairflow; + /// + /// Gets or sets the processparameterstable dryer air flow. + /// + [Column("DRYER_AIR_FLOW")] + + public Double DryerAirFlow + { + get + { + return _dryerairflow; + } + + set + { + _dryerairflow = value; RaisePropertyChanged(nameof(DryerAirFlow)); + } + + } + + protected Double _windertension; + /// + /// Gets or sets the processparameterstable winder tension. + /// + [Column("WINDER_TENSION")] + + public Double WinderTension + { + get + { + return _windertension; + } + + set + { + _windertension = value; RaisePropertyChanged(nameof(WinderTension)); + } + + } + + protected String _processparameterstablesgroupguid; + /// + /// Gets or sets the processparameterstable process parameters tables group guid. + /// + [Column("PROCESS_PARAMETERS_TABLES_GROUP_GUID")] + [ForeignKey("ProcessParametersTablesGroup")] + public String ProcessParametersTablesGroupGuid + { + get + { + return _processparameterstablesgroupguid; + } + + set + { + _processparameterstablesgroupguid = value; RaisePropertyChanged(nameof(ProcessParametersTablesGroupGuid)); + } + + } + + protected Int32 _tableindex; + /// + /// Gets or sets the processparameterstable table index. + /// + [Column("TABLE_INDEX")] + + public Int32 TableIndex + { + get + { + return _tableindex; + } + + set + { + _tableindex = value; RaisePropertyChanged(nameof(TableIndex)); + } + + } + + protected ProcessParametersTablesGroup _processparameterstablesgroup; + /// + /// Gets or sets the processparameterstable process parameters tables groups. + /// + + public virtual ProcessParametersTablesGroup ProcessParametersTablesGroup + { + get + { + return _processparameterstablesgroup; + } + + set + { + _processparameterstablesgroup = value; RaisePropertyChanged(nameof(ProcessParametersTablesGroup)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public ProcessParametersTable() : base() + { + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/ProcessParametersTablesGroup.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/ProcessParametersTablesGroup.cs new file mode 100644 index 000000000..d553952fc --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/ProcessParametersTablesGroup.cs @@ -0,0 +1,143 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("PROCESS_PARAMETERS_TABLES_GROUPS")] + public partial class ProcessParametersTablesGroup : ObservableEntity + { + + protected String _rmlguid; + /// + /// Gets or sets the processparameterstablesgroup rml guid. + /// + [Column("RML_GUID")] + [ForeignKey("Rml")] + public String RmlGuid + { + get + { + return _rmlguid; + } + + set + { + _rmlguid = value; RaisePropertyChanged(nameof(RmlGuid)); + } + + } + + protected String _name; + /// + /// Gets or sets the processparameterstablesgroup name. + /// + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected Boolean _active; + /// + /// Gets or sets the processparameterstablesgroup active. + /// + [Column("ACTIVE")] + + public Boolean Active + { + get + { + return _active; + } + + set + { + _active = value; RaisePropertyChanged(nameof(Active)); + } + + } + + protected DateTime _savedate; + /// + /// Gets or sets the processparameterstablesgroup save date. + /// + [Column("SAVE_DATE")] + + public DateTime SaveDate + { + get + { + return _savedate; + } + + set + { + _savedate = value; RaisePropertyChanged(nameof(SaveDate)); + } + + } + + protected ObservableCollection _processparameterstables; + /// + /// Gets or sets the processparameterstablesgroup process parameters tables. + /// + + public virtual ObservableCollection ProcessParametersTables + { + get + { + return _processparameterstables; + } + + set + { + _processparameterstables = value; RaisePropertyChanged(nameof(ProcessParametersTables)); + } + + } + + protected Rml _rml; + /// + /// Gets or sets the processparameterstablesgroup rml. + /// + + public virtual Rml Rml + { + get + { + return _rml; + } + + set + { + _rml = value; RaisePropertyChanged(nameof(Rml)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public ProcessParametersTablesGroup() : base() + { + + ProcessParametersTables = new ObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Rml.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Rml.cs new file mode 100644 index 000000000..564738b45 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Rml.cs @@ -0,0 +1,661 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("RMLS")] + public partial class Rml : ObservableEntity + { + + protected String _name; + /// + /// Gets or sets the rml name. + /// + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected String _manufacturer; + /// + /// Gets or sets the rml manufacturer. + /// + [Column("MANUFACTURER")] + + public String Manufacturer + { + get + { + return _manufacturer; + } + + set + { + _manufacturer = value; RaisePropertyChanged(nameof(Manufacturer)); + } + + } + + protected Int32 _code; + /// + /// Gets or sets the rml code. + /// + [Column("CODE")] + + public Int32 Code + { + get + { + return _code; + } + + set + { + _code = value; RaisePropertyChanged(nameof(Code)); + } + + } + + protected String _mediamaterialguid; + /// + /// Gets or sets the rml media material guid. + /// + [Column("MEDIA_MATERIAL_GUID")] + [ForeignKey("MediaMaterial")] + public String MediaMaterialGuid + { + get + { + return _mediamaterialguid; + } + + set + { + _mediamaterialguid = value; RaisePropertyChanged(nameof(MediaMaterialGuid)); + } + + } + + protected String _mediacolorguid; + /// + /// Gets or sets the rml media color guid. + /// + [Column("MEDIA_COLOR_GUID")] + [ForeignKey("MediaColor")] + public String MediaColorGuid + { + get + { + return _mediacolorguid; + } + + set + { + _mediacolorguid = value; RaisePropertyChanged(nameof(MediaColorGuid)); + } + + } + + protected String _mediapurposeguid; + /// + /// Gets or sets the rml media purpose guid. + /// + [Column("MEDIA_PURPOSE_GUID")] + [ForeignKey("MediaPurpose")] + public String MediaPurposeGuid + { + get + { + return _mediapurposeguid; + } + + set + { + _mediapurposeguid = value; RaisePropertyChanged(nameof(MediaPurposeGuid)); + } + + } + + protected String _mediaconditionguid; + /// + /// Gets or sets the rml media condition guid. + /// + [Column("MEDIA_CONDITION_GUID")] + [ForeignKey("MediaCondition")] + public String MediaConditionGuid + { + get + { + return _mediaconditionguid; + } + + set + { + _mediaconditionguid = value; RaisePropertyChanged(nameof(MediaConditionGuid)); + } + + } + + protected String _linearmassdensityunitguid; + /// + /// Gets or sets the rml linear mass density unit guid. + /// + [Column("LINEAR_MASS_DENSITY_UNIT_GUID")] + [ForeignKey("LinearMassDensityUnit")] + public String LinearMassDensityUnitGuid + { + get + { + return _linearmassdensityunitguid; + } + + set + { + _linearmassdensityunitguid = value; RaisePropertyChanged(nameof(LinearMassDensityUnitGuid)); + } + + } + + protected String _fibershapeguid; + /// + /// Gets or sets the rml fiber shape guid. + /// + [Column("FIBER_SHAPE_GUID")] + [ForeignKey("FiberShape")] + public String FiberShapeGuid + { + get + { + return _fibershapeguid; + } + + set + { + _fibershapeguid = value; RaisePropertyChanged(nameof(FiberShapeGuid)); + } + + } + + protected String _fibersynthguid; + /// + /// Gets or sets the rml fiber synth guid. + /// + [Column("FIBER_SYNTH_GUID")] + [ForeignKey("FiberSynth")] + public String FiberSynthGuid + { + get + { + return _fibersynthguid; + } + + set + { + _fibersynthguid = value; RaisePropertyChanged(nameof(FiberSynthGuid)); + } + + } + + protected Double _fibersize; + /// + /// Gets or sets the rml fiber size. + /// + [Column("FIBER_SIZE")] + + public Double FiberSize + { + get + { + return _fibersize; + } + + set + { + _fibersize = value; RaisePropertyChanged(nameof(FiberSize)); + } + + } + + protected Int32 _numberoffibers; + /// + /// Gets or sets the rml number of fibers. + /// + [Column("NUMBER_OF_FIBERS")] + + public Int32 NumberOfFibers + { + get + { + return _numberoffibers; + } + + set + { + _numberoffibers = value; RaisePropertyChanged(nameof(NumberOfFibers)); + } + + } + + protected Int32 _pliesperfiber; + /// + /// Gets or sets the rml plies per fiber. + /// + [Column("PLIES_PER_FIBER")] + + public Int32 PliesPerFiber + { + get + { + return _pliesperfiber; + } + + set + { + _pliesperfiber = value; RaisePropertyChanged(nameof(PliesPerFiber)); + } + + } + + protected Int32 _pliesperthread; + /// + /// Gets or sets the rml plies per thread. + /// + [Column("PLIES_PER_THREAD")] + + public Int32 PliesPerThread + { + get + { + return _pliesperthread; + } + + set + { + _pliesperthread = value; RaisePropertyChanged(nameof(PliesPerThread)); + } + + } + + protected Boolean _twisted; + /// + /// Gets or sets the rml twisted. + /// + [Column("TWISTED")] + + public Boolean Twisted + { + get + { + return _twisted; + } + + set + { + _twisted = value; RaisePropertyChanged(nameof(Twisted)); + } + + } + + protected Boolean _airentanglement; + /// + /// Gets or sets the rml air entanglement. + /// + [Column("AIR_ENTANGLEMENT")] + + public Boolean AirEntanglement + { + get + { + return _airentanglement; + } + + set + { + _airentanglement = value; RaisePropertyChanged(nameof(AirEntanglement)); + } + + } + + protected Boolean _lubricant; + /// + /// Gets or sets the rml lubricant. + /// + [Column("LUBRICANT")] + + public Boolean Lubricant + { + get + { + return _lubricant; + } + + set + { + _lubricant = value; RaisePropertyChanged(nameof(Lubricant)); + } + + } + + protected Double _tensilestrength; + /// + /// Gets or sets the rml tensile strength. + /// + [Column("TENSILE_STRENGTH")] + + public Double TensileStrength + { + get + { + return _tensilestrength; + } + + set + { + _tensilestrength = value; RaisePropertyChanged(nameof(TensileStrength)); + } + + } + + protected Double _elongationatbreakpercentage; + /// + /// Gets or sets the rml elongation at break percentage. + /// + [Column("ELONGATION_AT_BREAK_PERCENTAGE")] + + public Double ElongationAtBreakPercentage + { + get + { + return _elongationatbreakpercentage; + } + + set + { + _elongationatbreakpercentage = value; RaisePropertyChanged(nameof(ElongationAtBreakPercentage)); + } + + } + + protected Double _estimatedthreaddiameter; + /// + /// Gets or sets the rml estimated thread diameter. + /// + [Column("ESTIMATED_THREAD_DIAMETER")] + + public Double EstimatedThreadDiameter + { + get + { + return _estimatedthreaddiameter; + } + + set + { + _estimatedthreaddiameter = value; RaisePropertyChanged(nameof(EstimatedThreadDiameter)); + } + + } + + protected ObservableCollection _cats; + /// + /// Gets or sets the rml cats. + /// + + public virtual ObservableCollection Cats + { + get + { + return _cats; + } + + set + { + _cats = value; RaisePropertyChanged(nameof(Cats)); + } + + } + + protected ObservableCollection _ccts; + /// + /// Gets or sets the rml ccts. + /// + + public virtual ObservableCollection Ccts + { + get + { + return _ccts; + } + + set + { + _ccts = value; RaisePropertyChanged(nameof(Ccts)); + } + + } + + protected FiberShape _fibershape; + /// + /// Gets or sets the rml fiber shapes. + /// + + public virtual FiberShape FiberShape + { + get + { + return _fibershape; + } + + set + { + _fibershape = value; RaisePropertyChanged(nameof(FiberShape)); + } + + } + + protected FiberSynth _fibersynth; + /// + /// Gets or sets the rml fiber synths. + /// + + public virtual FiberSynth FiberSynth + { + get + { + return _fibersynth; + } + + set + { + _fibersynth = value; RaisePropertyChanged(nameof(FiberSynth)); + } + + } + + protected ObservableCollection _jobs; + /// + /// Gets or sets the rml jobs. + /// + + public virtual ObservableCollection Jobs + { + get + { + return _jobs; + } + + set + { + _jobs = value; RaisePropertyChanged(nameof(Jobs)); + } + + } + + protected LinearMassDensityUnit _linearmassdensityunit; + /// + /// Gets or sets the rml linear mass density units. + /// + + public virtual LinearMassDensityUnit LinearMassDensityUnit + { + get + { + return _linearmassdensityunit; + } + + set + { + _linearmassdensityunit = value; RaisePropertyChanged(nameof(LinearMassDensityUnit)); + } + + } + + protected ObservableCollection _liquidtypesrmls; + /// + /// Gets or sets the rml liquid types rmls. + /// + + public virtual ObservableCollection LiquidTypesRmls + { + get + { + return _liquidtypesrmls; + } + + set + { + _liquidtypesrmls = value; RaisePropertyChanged(nameof(LiquidTypesRmls)); + } + + } + + protected MediaColor _mediacolor; + /// + /// Gets or sets the rml media colors. + /// + + public virtual MediaColor MediaColor + { + get + { + return _mediacolor; + } + + set + { + _mediacolor = value; RaisePropertyChanged(nameof(MediaColor)); + } + + } + + protected MediaCondition _mediacondition; + /// + /// Gets or sets the rml media conditions. + /// + + public virtual MediaCondition MediaCondition + { + get + { + return _mediacondition; + } + + set + { + _mediacondition = value; RaisePropertyChanged(nameof(MediaCondition)); + } + + } + + protected MediaMaterial _mediamaterial; + /// + /// Gets or sets the rml media materials. + /// + + public virtual MediaMaterial MediaMaterial + { + get + { + return _mediamaterial; + } + + set + { + _mediamaterial = value; RaisePropertyChanged(nameof(MediaMaterial)); + } + + } + + protected MediaPurpos _mediapurpose; + /// + /// Gets or sets the rml media purposes. + /// + + public virtual MediaPurpos MediaPurpose + { + get + { + return _mediapurpose; + } + + set + { + _mediapurpose = value; RaisePropertyChanged(nameof(MediaPurpose)); + } + + } + + protected ObservableCollection _processparameterstablesgroups; + /// + /// Gets or sets the rml process parameters tables groups. + /// + + public virtual ObservableCollection ProcessParametersTablesGroups + { + get + { + return _processparameterstablesgroups; + } + + set + { + _processparameterstablesgroups = value; RaisePropertyChanged(nameof(ProcessParametersTablesGroups)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public Rml() : base() + { + + Cats = new ObservableCollection(); + + Ccts = new ObservableCollection(); + + Jobs = new ObservableCollection(); + + LiquidTypesRmls = new ObservableCollection(); + + ProcessParametersTablesGroups = new ObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Role.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Role.cs new file mode 100644 index 000000000..e1aef394e --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Role.cs @@ -0,0 +1,125 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("ROLES")] + public partial class Role : ObservableEntity + { + + protected Int32 _code; + /// + /// Gets or sets the role code. + /// + [Column("CODE")] + + public Int32 Code + { + get + { + return _code; + } + + set + { + _code = value; RaisePropertyChanged(nameof(Code)); + } + + } + + protected String _name; + /// + /// Gets or sets the role name. + /// + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected String _description; + /// + /// Gets or sets the role description. + /// + [Column("DESCRIPTION")] + + public String Description + { + get + { + return _description; + } + + set + { + _description = value; RaisePropertyChanged(nameof(Description)); + } + + } + + protected ObservableCollection _rolespermissions; + /// + /// Gets or sets the role roles permissions. + /// + + public virtual ObservableCollection RolesPermissions + { + get + { + return _rolespermissions; + } + + set + { + _rolespermissions = value; RaisePropertyChanged(nameof(RolesPermissions)); + } + + } + + protected ObservableCollection _usersroles; + /// + /// Gets or sets the role users roles. + /// + + public virtual ObservableCollection UsersRoles + { + get + { + return _usersroles; + } + + set + { + _usersroles = value; RaisePropertyChanged(nameof(UsersRoles)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public Role() : base() + { + + RolesPermissions = new ObservableCollection(); + + UsersRoles = new ObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/RolesPermission.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/RolesPermission.cs new file mode 100644 index 000000000..8d81ace27 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/RolesPermission.cs @@ -0,0 +1,100 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("ROLES_PERMISSIONS")] + public partial class RolesPermission : ObservableEntity + { + + protected String _roleguid; + /// + /// Gets or sets the rolespermission role guid. + /// + [Column("ROLE_GUID")] + [ForeignKey("Role")] + public String RoleGuid + { + get + { + return _roleguid; + } + + set + { + _roleguid = value; RaisePropertyChanged(nameof(RoleGuid)); + } + + } + + protected String _permissionguid; + /// + /// Gets or sets the rolespermission permission guid. + /// + [Column("PERMISSION_GUID")] + [ForeignKey("Permission")] + public String PermissionGuid + { + get + { + return _permissionguid; + } + + set + { + _permissionguid = value; RaisePropertyChanged(nameof(PermissionGuid)); + } + + } + + protected Permission _permission; + /// + /// Gets or sets the rolespermission permission. + /// + + public virtual Permission Permission + { + get + { + return _permission; + } + + set + { + _permission = value; RaisePropertyChanged(nameof(Permission)); + } + + } + + protected Role _role; + /// + /// Gets or sets the rolespermission role. + /// + + public virtual Role Role + { + get + { + return _role; + } + + set + { + _role = value; RaisePropertyChanged(nameof(Role)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public RolesPermission() : base() + { + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Segment.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Segment.cs new file mode 100644 index 000000000..6a2b59b04 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Segment.cs @@ -0,0 +1,123 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("SEGMENTS")] + public partial class Segment : ObservableEntity + { + + protected String _name; + /// + /// Gets or sets the segment name. + /// + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected String _jobguid; + /// + /// Gets or sets the segment job guid. + /// + [Column("JOB_GUID")] + [ForeignKey("Job")] + public String JobGuid + { + get + { + return _jobguid; + } + + set + { + _jobguid = value; RaisePropertyChanged(nameof(JobGuid)); + } + + } + + protected Double _length; + /// + /// Gets or sets the segment length. + /// + [Column("LENGTH")] + + public Double Length + { + get + { + return _length; + } + + set + { + _length = value; RaisePropertyChanged(nameof(Length)); + } + + } + + protected ObservableCollection _brushstops; + /// + /// Gets or sets the segment brush stops. + /// + + public virtual ObservableCollection BrushStops + { + get + { + return _brushstops; + } + + set + { + _brushstops = value; RaisePropertyChanged(nameof(BrushStops)); + } + + } + + protected Job _job; + /// + /// Gets or sets the segment job. + /// + + public virtual Job Job + { + get + { + return _job; + } + + set + { + _job = value; RaisePropertyChanged(nameof(Job)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public Segment() : base() + { + + BrushStops = new ObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Sensor.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Sensor.cs new file mode 100644 index 000000000..7237f0067 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Sensor.cs @@ -0,0 +1,202 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("SENSORS")] + public partial class Sensor : ObservableEntity + { + + protected Int32 _code; + /// + /// Gets or sets the sensor code. + /// + [Column("CODE")] + + public Int32 Code + { + get + { + return _code; + } + + set + { + _code = value; RaisePropertyChanged(nameof(Code)); + } + + } + + protected String _name; + /// + /// Gets or sets the sensor name. + /// + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected String _description; + /// + /// Gets or sets the sensor description. + /// + [Column("DESCRIPTION")] + + public String Description + { + get + { + return _description; + } + + set + { + _description = value; RaisePropertyChanged(nameof(Description)); + } + + } + + protected Double _min; + /// + /// Gets or sets the sensor min. + /// + [Column("MIN")] + + public Double Min + { + get + { + return _min; + } + + set + { + _min = value; RaisePropertyChanged(nameof(Min)); + } + + } + + protected Double _max; + /// + /// Gets or sets the sensor max. + /// + [Column("MAX")] + + public Double Max + { + get + { + return _max; + } + + set + { + _max = value; RaisePropertyChanged(nameof(Max)); + } + + } + + protected String _units; + /// + /// Gets or sets the sensor units. + /// + [Column("UNITS")] + + public String Units + { + get + { + return _units; + } + + set + { + _units = value; RaisePropertyChanged(nameof(Units)); + } + + } + + protected Int32 _pointsperframe; + /// + /// Gets or sets the sensor points per frame. + /// + [Column("POINTS_PER_FRAME")] + + public Int32 PointsPerFrame + { + get + { + return _pointsperframe; + } + + set + { + _pointsperframe = value; RaisePropertyChanged(nameof(PointsPerFrame)); + } + + } + + protected Boolean _multichannel; + /// + /// Gets or sets the sensor multi channel. + /// + [Column("MULTI_CHANNEL")] + + public Boolean MultiChannel + { + get + { + return _multichannel; + } + + set + { + _multichannel = value; RaisePropertyChanged(nameof(MultiChannel)); + } + + } + + protected Int32 _channelcount; + /// + /// Gets or sets the sensor channel count. + /// + [Column("CHANNEL_COUNT")] + + public Int32 ChannelCount + { + get + { + return _channelcount; + } + + set + { + _channelcount = value; RaisePropertyChanged(nameof(ChannelCount)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public Sensor() : base() + { + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/SyncConfiguration.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/SyncConfiguration.cs new file mode 100644 index 000000000..de686469b --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/SyncConfiguration.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("SYNC_CONFIGURATIONS")] + public partial class SyncConfiguration : ObservableEntity + { + + /// + /// Initializes a new instance of the class. + /// + public SyncConfiguration() : base() + { + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/User.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/User.cs new file mode 100644 index 000000000..986146b83 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/User.cs @@ -0,0 +1,242 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("USERS")] + public partial class User : ObservableEntity + { + + protected Boolean _deleted; + /// + /// Gets or sets the user deleted. + /// + [Column("DELETED")] + + public Boolean Deleted + { + get + { + return _deleted; + } + + set + { + _deleted = value; RaisePropertyChanged(nameof(Deleted)); + } + + } + + protected String _email; + /// + /// Gets or sets the user email. + /// + [Column("EMAIL")] + + public String Email + { + get + { + return _email; + } + + set + { + _email = value; RaisePropertyChanged(nameof(Email)); + } + + } + + protected String _password; + /// + /// Gets or sets the user password. + /// + [Column("PASSWORD")] + + public String Password + { + get + { + return _password; + } + + set + { + _password = value; RaisePropertyChanged(nameof(Password)); + } + + } + + protected String _organizationguid; + /// + /// Gets or sets the user organization guid. + /// + [Column("ORGANIZATION_GUID")] + [ForeignKey("Organization")] + public String OrganizationGuid + { + get + { + return _organizationguid; + } + + set + { + _organizationguid = value; RaisePropertyChanged(nameof(OrganizationGuid)); + } + + } + + protected String _contactguid; + /// + /// Gets or sets the user contact guid. + /// + [Column("CONTACT_GUID")] + [ForeignKey("Contact")] + public String ContactGuid + { + get + { + return _contactguid; + } + + set + { + _contactguid = value; RaisePropertyChanged(nameof(ContactGuid)); + } + + } + + protected String _addressguid; + /// + /// Gets or sets the user address guid. + /// + [Column("ADDRESS_GUID")] + [ForeignKey("Address")] + public String AddressGuid + { + get + { + return _addressguid; + } + + set + { + _addressguid = value; RaisePropertyChanged(nameof(AddressGuid)); + } + + } + + protected Address _address; + /// + /// Gets or sets the user address. + /// + + public virtual Address Address + { + get + { + return _address; + } + + set + { + _address = value; RaisePropertyChanged(nameof(Address)); + } + + } + + protected Contact _contact; + /// + /// Gets or sets the user contact. + /// + + public virtual Contact Contact + { + get + { + return _contact; + } + + set + { + _contact = value; RaisePropertyChanged(nameof(Contact)); + } + + } + + protected ObservableCollection _machinesevents; + /// + /// Gets or sets the user machines events. + /// + + public virtual ObservableCollection MachinesEvents + { + get + { + return _machinesevents; + } + + set + { + _machinesevents = value; RaisePropertyChanged(nameof(MachinesEvents)); + } + + } + + protected Organization _organization; + /// + /// Gets or sets the user organization. + /// + + public virtual Organization Organization + { + get + { + return _organization; + } + + set + { + _organization = value; RaisePropertyChanged(nameof(Organization)); + } + + } + + protected ObservableCollection _usersroles; + /// + /// Gets or sets the user users roles. + /// + + public virtual ObservableCollection UsersRoles + { + get + { + return _usersroles; + } + + set + { + _usersroles = value; RaisePropertyChanged(nameof(UsersRoles)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public User() : base() + { + + MachinesEvents = new ObservableCollection(); + + UsersRoles = new ObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/UsersRole.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/UsersRole.cs new file mode 100644 index 000000000..3b8b2194f --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/UsersRole.cs @@ -0,0 +1,120 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("USERS_ROLES")] + public partial class UsersRole : ObservableEntity + { + + protected Boolean _deleted; + /// + /// Gets or sets the usersrole deleted. + /// + [Column("DELETED")] + + public Boolean Deleted + { + get + { + return _deleted; + } + + set + { + _deleted = value; RaisePropertyChanged(nameof(Deleted)); + } + + } + + protected String _userguid; + /// + /// Gets or sets the usersrole user guid. + /// + [Column("USER_GUID")] + [ForeignKey("User")] + public String UserGuid + { + get + { + return _userguid; + } + + set + { + _userguid = value; RaisePropertyChanged(nameof(UserGuid)); + } + + } + + protected String _roleguid; + /// + /// Gets or sets the usersrole role guid. + /// + [Column("ROLE_GUID")] + [ForeignKey("Role")] + public String RoleGuid + { + get + { + return _roleguid; + } + + set + { + _roleguid = value; RaisePropertyChanged(nameof(RoleGuid)); + } + + } + + protected Role _role; + /// + /// Gets or sets the usersrole role. + /// + + public virtual Role Role + { + get + { + return _role; + } + + set + { + _role = value; RaisePropertyChanged(nameof(Role)); + } + + } + + protected User _user; + /// + /// Gets or sets the usersrole user. + /// + + public virtual User User + { + get + { + return _user; + } + + set + { + _user = value; RaisePropertyChanged(nameof(User)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public UsersRole() : base() + { + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/WindingMethod.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/WindingMethod.cs new file mode 100644 index 000000000..a77a42fdc --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/WindingMethod.cs @@ -0,0 +1,104 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using Tango.DAL.Remote.DB; + +namespace Tango.Integration.Observables +{ + [Table("WINDING_METHODS")] + public partial class WindingMethod : ObservableEntity + { + + protected Int32 _code; + /// + /// Gets or sets the windingmethod code. + /// + [Column("CODE")] + + public Int32 Code + { + get + { + return _code; + } + + set + { + _code = value; RaisePropertyChanged(nameof(Code)); + } + + } + + protected String _name; + /// + /// Gets or sets the windingmethod name. + /// + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + _name = value; RaisePropertyChanged(nameof(Name)); + } + + } + + protected String _description; + /// + /// Gets or sets the windingmethod description. + /// + [Column("DESCRIPTION")] + + public String Description + { + get + { + return _description; + } + + set + { + _description = value; RaisePropertyChanged(nameof(Description)); + } + + } + + protected ObservableCollection _jobs; + /// + /// Gets or sets the windingmethod jobs. + /// + + public virtual ObservableCollection Jobs + { + get + { + return _jobs; + } + + set + { + _jobs = value; RaisePropertyChanged(nameof(Jobs)); + } + + } + + /// + /// Initializes a new instance of the class. + /// + public WindingMethod() : base() + { + + Jobs = new ObservableCollection(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/EntityFieldNameAttribute.cs b/Software/Visual_Studio/Tango.Integration/Observables/EntityFieldNameAttribute.cs new file mode 100644 index 000000000..6830b4cd7 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/EntityFieldNameAttribute.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.Integration.Observables +{ + /// + /// Represents an property attribute. + /// + /// + public class EntityFieldNameAttribute : Attribute + { + /// + /// Gets or sets the table column name. + /// + public String Name { get; set; } + + /// + /// Initializes a new instance of the class. + /// + /// The column name. + public EntityFieldNameAttribute(String name) + { + Name = name; + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/ActionTypes.cs b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/ActionTypes.cs new file mode 100644 index 000000000..ef45931de --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/ActionTypes.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.ComponentModel; + +namespace Tango.DAL.Observables +{ + public enum ActionTypes + { + + /// + /// (Some description) + /// + [Description("Some description")] + Action1 = 1, + + /// + /// (Some action 2 description) + /// + [Description("Some action 2 description")] + Action2yesss = 2, + + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/Actions.cs b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/Actions.cs new file mode 100644 index 000000000..b4c60fea1 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/Actions.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.ComponentModel; + +namespace Tango.Integration.Observables +{ + public enum Actions + { + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/CartridgeTypes.cs b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/CartridgeTypes.cs new file mode 100644 index 000000000..bf74eb246 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/CartridgeTypes.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.ComponentModel; + +namespace Tango.Integration.Observables +{ + public enum CartridgeTypes + { + + /// + /// (Cartridge 1) + /// + [Description("Cartridge 1")] + Cartridge1 = 1, + + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/ColorSpaces.cs b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/ColorSpaces.cs new file mode 100644 index 000000000..9c8688dc1 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/ColorSpaces.cs @@ -0,0 +1,43 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.ComponentModel; + +namespace Tango.Integration.Observables +{ + public enum ColorSpaces + { + + /// + /// (Volume) + /// + [Description("Volume")] + Volume = 0, + + /// + /// (RGB) + /// + [Description("RGB")] + RGB = 1, + + /// + /// (CMYK) + /// + [Description("CMYK")] + CMYK = 2, + + /// + /// (LAB) + /// + [Description("LAB")] + LAB = 3, + + /// + /// (PANTON) + /// + [Description("PANTON")] + PANTON = 4, + + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/DispenserTypes.cs b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/DispenserTypes.cs new file mode 100644 index 000000000..6b12c22df --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/DispenserTypes.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.ComponentModel; + +namespace Tango.Integration.Observables +{ + public enum DispenserTypes + { + + /// + /// (Dispenser 1) + /// + [Description("Dispenser 1")] + Dispenser1 = 1, + + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/EventTypes.cs b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/EventTypes.cs new file mode 100644 index 000000000..66df05539 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/EventTypes.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.ComponentModel; + +namespace Tango.DAL.Observables +{ + public enum EventTypes + { + + /// + /// (Some event description) + /// + [Description("Some event description")] + Event1 = 1, + + /// + /// (Some event 2 description) + /// + [Description("Some event 2 description")] + Event2 = 2, + + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/Events.cs b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/Events.cs new file mode 100644 index 000000000..0c23334fb --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/Events.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.ComponentModel; + +namespace Tango.Integration.Observables +{ + public enum Events + { + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/FiberShapes.cs b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/FiberShapes.cs new file mode 100644 index 000000000..e2cac4dde --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/FiberShapes.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.ComponentModel; + +namespace Tango.Integration.Observables +{ + public enum FiberShapes + { + + /// + /// (Triangle) + /// + [Description("Triangle")] + Triangle = 1, + + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/FiberSynthes.cs b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/FiberSynthes.cs new file mode 100644 index 000000000..4bc13b83a --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/FiberSynthes.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.ComponentModel; + +namespace Tango.DAL.Observables +{ + public enum FiberSynthes + { + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/FiberSynthesises.cs b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/FiberSynthesises.cs new file mode 100644 index 000000000..879f9fb31 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/FiberSynthesises.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.ComponentModel; + +namespace Tango.Integration.Observables +{ + public enum FiberSynthesises + { + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/FiberSynths.cs b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/FiberSynths.cs new file mode 100644 index 000000000..66ef5b189 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/FiberSynths.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.ComponentModel; + +namespace Tango.DAL.Observables +{ + public enum FiberSynths + { + + /// + /// (Some syntheses type) + /// + [Description("Some syntheses type")] + Somesynthesestype = 1, + + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/IdsPackFormulas.cs b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/IdsPackFormulas.cs new file mode 100644 index 000000000..0ac09b4fd --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/IdsPackFormulas.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.ComponentModel; + +namespace Tango.Integration.Observables +{ + public enum IdsPackFormulas + { + + /// + /// (Standard Color IDS Pack Formula) + /// + [Description("Standard Color IDS Pack Formula")] + StandardColor = 0, + + /// + /// (Standard Color IDS Pack Formula) + /// + [Description("Diluter")] + Diluter = 1, + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/LinearMassDensityUnits.cs b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/LinearMassDensityUnits.cs new file mode 100644 index 000000000..757033e67 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/LinearMassDensityUnits.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.ComponentModel; + +namespace Tango.Integration.Observables +{ + public enum LinearMassDensityUnits + { + + /// + /// (Dex) + /// + [Description("Dex")] + Dex = 1, + + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/LiquidTypes.cs b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/LiquidTypes.cs new file mode 100644 index 000000000..bc2bf036b --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/LiquidTypes.cs @@ -0,0 +1,55 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.ComponentModel; + +namespace Tango.DAL.Observables +{ + public enum LiquidTypes + { + + /// + /// (Cyan) + /// + [Description("Cyan")] + Cyan = 1, + + /// + /// (Red) + /// + [Description("Red")] + Red = 7, + + /// + /// (Transparent Ink) + /// + [Description("Transparent Ink")] + TransparentInk = 6, + + /// + /// (Magenta) + /// + [Description("Magenta")] + Magenta = 2, + + /// + /// (Lubricant) + /// + [Description("Lubricant")] + Lubricant = 5, + + /// + /// (Yellow) + /// + [Description("Yellow")] + Yellow = 2, + + /// + /// (Black) + /// + [Description("Black")] + Black = 4, + + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/Liquids.cs b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/Liquids.cs new file mode 100644 index 000000000..5f318587f --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/Liquids.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.ComponentModel; + +namespace Tango.Integration.Observables +{ + public enum Liquids + { + + /// + /// (Cyan) + /// + [Description("Cyan")] + Cyan = 1, + + /// + /// (Magenta) + /// + [Description("Magenta")] + Magenta = 2, + + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/MediaConditions.cs b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/MediaConditions.cs new file mode 100644 index 000000000..0fd9c3ee5 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/MediaConditions.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.ComponentModel; + +namespace Tango.Integration.Observables +{ + public enum MediaConditions + { + + /// + /// (Treated) + /// + [Description("Treated")] + Treated = 1, + + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/MediaMaterials.cs b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/MediaMaterials.cs new file mode 100644 index 000000000..4292eca32 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/MediaMaterials.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.ComponentModel; + +namespace Tango.Integration.Observables +{ + public enum MediaMaterials + { + + /// + /// (Nylon) + /// + [Description("Nylon")] + Nylon = 1, + + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/MediaPurposes.cs b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/MediaPurposes.cs new file mode 100644 index 000000000..b859c3dad --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/MediaPurposes.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.ComponentModel; + +namespace Tango.Integration.Observables +{ + public enum MediaPurposes + { + + /// + /// (Embroidery) + /// + [Description("Embroidery")] + Embroidery = 1, + + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/MidTankTypes.cs b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/MidTankTypes.cs new file mode 100644 index 000000000..e536488e7 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/MidTankTypes.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.ComponentModel; + +namespace Tango.Integration.Observables +{ + public enum MidTankTypes + { + + /// + /// (Liter Tank 2) + /// + [Description("Liter Tank 2")] + LiterTank2 = 1, + + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/Permissions.cs b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/Permissions.cs new file mode 100644 index 000000000..39014b04b --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/Permissions.cs @@ -0,0 +1,43 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.ComponentModel; + +namespace Tango.Integration.Observables +{ + public enum Permissions + { + + /// + /// (Allows loading the technician module in Machine Studio) + /// + [Description("Allows loading the technician module in Machine Studio")] + RunTechnicianModule = 0, + + /// + /// (Allows loading the developer module in Machine Studio) + /// + [Description("Allows loading the developer module in Machine Studio")] + RunDeveloperModule = 1, + + /// + /// (Allows loading the database module in Machine Studio) + /// + [Description("Allows loading the database module in Machine Studio")] + RunDataBaseModule = 2, + + /// + /// (Allows loading the synchronization module in machine studio) + /// + [Description("Allows loading the synchronization module in machine studio")] + RunSynchronizationModule = 3, + + /// + /// (Allows loading the machine designer module in Machine Studio) + /// + [Description("Allows loading the machine designer module in Machine Studio")] + RunMachineDesignerModule = 4, + + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/Rmls.cs b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/Rmls.cs new file mode 100644 index 000000000..5f8bb5eef --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/Rmls.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.ComponentModel; + +namespace Tango.DAL.Observables +{ + public enum Rmls + { + + /// + /// (RML 2) + /// + [Description("RML 2")] + RML2 = 0, + + /// + /// (RML 1) + /// + [Description("RML 1")] + RML1 = 0, + + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/Roles.cs b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/Roles.cs new file mode 100644 index 000000000..9e81889ae --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/Roles.cs @@ -0,0 +1,43 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.ComponentModel; + +namespace Tango.Integration.Observables +{ + public enum Roles + { + + /// + /// (User with standard permissions) + /// + [Description("User with standard permissions")] + User = 0, + + /// + /// (Twine administrator) + /// + [Description("Twine administrator")] + Administrator = 1, + + /// + /// (Twine technician) + /// + [Description("Twine technician")] + Technician = 2, + + /// + /// (Twine Research and development) + /// + [Description("Twine Research and development")] + Developer = 3, + + /// + /// (Role Description) + /// + [Description("Role Description")] + SomeRole = 4, + + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/Sensors.cs b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/Sensors.cs new file mode 100644 index 000000000..e069a123c --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/Sensors.cs @@ -0,0 +1,181 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.ComponentModel; + +namespace Tango.Integration.Observables +{ + public enum Sensors + { + + /// + /// (Dancer 1) + /// + [Description("Dancer 1")] + Dancer1Angle = 0, + + /// + /// (Dancer 2) + /// + [Description("Dancer 2")] + Dancer2Angle = 1, + + /// + /// (Dancer 3) + /// + [Description("Dancer 3")] + Dancer3Angle = 2, + + /// + /// (Feeder Motor) + /// + [Description("Feeder Motor")] + FeederMotorFrequency = 3, + + /// + /// (Dryer Motor) + /// + [Description("Dryer Motor")] + DryerMotor = 4, + + /// + /// (Poller Motor) + /// + [Description("Poller Motor")] + PollerMotor = 5, + + /// + /// (Winder Motor) + /// + [Description("Winder Motor")] + WinderMotor = 6, + + /// + /// (Screw Motor) + /// + [Description("Screw Motor")] + ScrewMotor = 7, + + /// + /// (Thread Speed) + /// + [Description("Thread Speed")] + ThreadSpeed = 8, + + /// + /// (Mixer) + /// + [Description("Mixer")] + MixerTemperature = 9, + + /// + /// (Head Zone 1) + /// + [Description("Head Zone 1")] + HeadZone1Temperature = 10, + + /// + /// (Head Zone 2) + /// + [Description("Head Zone 2")] + HeadZone2Temperature = 11, + + /// + /// (Head Zone 3) + /// + [Description("Head Zone 3")] + HeadZone3Temperature = 12, + + /// + /// (Head Air Flow) + /// + [Description("Head Air Flow")] + HeadAirFlow = 13, + + /// + /// (Feeder Tension) + /// + [Description("Feeder Tension")] + FeederTension = 14, + + /// + /// (Puller Tension) + /// + [Description("Puller Tension")] + PullerTension = 15, + + /// + /// (Dryer Zone 1) + /// + [Description("Dryer Zone 1")] + DryerZone1Temperature = 16, + + /// + /// (Dryer Zone 2) + /// + [Description("Dryer Zone 2")] + DryerZone2Temperature = 17, + + /// + /// (Dryer Zone 3) + /// + [Description("Dryer Zone 3")] + DryerZone3Temperature = 18, + + /// + /// (Dryer Air Flow) + /// + [Description("Dryer Air Flow")] + DryerAirFlow = 19, + + /// + /// (Winder Tension) + /// + [Description("Winder Tension")] + WinderTension = 20, + + /// + /// (Dispensers Motors) + /// + [Description("Dispensers Motors")] + DispensersMotorsFrequency = 21, + + /// + /// (Dispensers Angular Encoders) + /// + [Description("Dispensers Angular Encoders")] + DispensersAngularEncoders = 22, + + /// + /// (Dispensers Linear Positions) + /// + [Description("Dispensers Linear Positions")] + DispensersLinearPositions = 23, + + /// + /// (Dispensers Pressure) + /// + [Description("Dispensers Pressure")] + DispensersPressure = 24, + + /// + /// (Mid Tank Pressure) + /// + [Description("Mid Tank Pressure")] + MidTankPressure = 25, + + /// + /// (Filter Delta Pressure) + /// + [Description("Filter Delta Pressure")] + FilterDeltaPressure = 26, + + /// + /// (Chiller Temperature) + /// + [Description("Chiller Temperature")] + ChillerTemperature = 27, + + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/WindingMethods.cs b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/WindingMethods.cs new file mode 100644 index 000000000..91eeaeed7 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Enumerations/WindingMethods.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.ComponentModel; + +namespace Tango.Integration.Observables +{ + public enum WindingMethods + { + + /// + /// (Embroidery Winding) + /// + [Description("Embroidery Winding")] + Embroidery = 0, + + /// + /// (Calibration Winding) + /// + [Description("Calibration Winding")] + Calibration = 1, + + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/ExtensionMethods/ConfigurationExtensions.cs b/Software/Visual_Studio/Tango.Integration/Observables/ExtensionMethods/ConfigurationExtensions.cs new file mode 100644 index 000000000..c842f3c30 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/ExtensionMethods/ConfigurationExtensions.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.Integration.Observables; + +/// +/// Contains extension methods. +/// +public static class ConfigurationExtensions +{ + /// + /// Clones the configuration along with it's IDS packs. + /// + /// The configuration. + /// + public static Configuration CloneConfiguration(this Configuration configuration) + { + Configuration cloned = configuration.CloneEntity(); + cloned.CreationDate = DateTime.UtcNow; + + foreach (var idsPack in configuration.IdsPacks) + { + IdsPack clonedPack = idsPack.CloneEntity(); + clonedPack.Configuration = cloned; + clonedPack.DispenserType = idsPack.DispenserType; + clonedPack.CartridgeType = idsPack.CartridgeType; + clonedPack.MidTankType = idsPack.MidTankType; + clonedPack.IdsPackFormula = idsPack.IdsPackFormula; + cloned.IdsPacks.Add(clonedPack); + } + + return cloned; + } +} + diff --git a/Software/Visual_Studio/Tango.Integration/Observables/ExtensionMethods/ObservableEntityExtensions.cs b/Software/Visual_Studio/Tango.Integration/Observables/ExtensionMethods/ObservableEntityExtensions.cs new file mode 100644 index 000000000..b4c26f414 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/ExtensionMethods/ObservableEntityExtensions.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.Integration.Observables; + +/// +/// Contains extension methods. +/// +public static class ObservableEntityExtensions +{ + /// + /// Performs a shallow cloning of this entity. + /// + /// + /// The entity. + /// + public static T CloneEntity(this T entity) where T : class, IObservableEntity + { + T cloned = entity.ShallowClone(); + cloned.ID = 0; + cloned.Guid = Guid.NewGuid().ToString(); + cloned.LastUpdated = DateTime.UtcNow; + return cloned; + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/ExtensionMethods/ProcessParametersTablesGroupExtensions.cs b/Software/Visual_Studio/Tango.Integration/Observables/ExtensionMethods/ProcessParametersTablesGroupExtensions.cs new file mode 100644 index 000000000..287597b3e --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/ExtensionMethods/ProcessParametersTablesGroupExtensions.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.Integration.Observables; + +public static class ProcessParametersTablesGroupExtensions +{ + public static ProcessParametersTablesGroup CloneGroup(this ProcessParametersTablesGroup group) + { + ProcessParametersTablesGroup cloned = group.CloneEntity(); + + List tables = new List(); + foreach (var table in group.ProcessParametersTables) + { + var newTable = table.CloneEntity(); + newTable.ProcessParametersTablesGroup = cloned; + tables.Add(newTable); + } + + cloned.ProcessParametersTables = tables.ToObservableCollection(); + + return cloned; + } +} + diff --git a/Software/Visual_Studio/Tango.Integration/Observables/IObservableEntity.cs b/Software/Visual_Studio/Tango.Integration/Observables/IObservableEntity.cs new file mode 100644 index 000000000..0439d57b0 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/IObservableEntity.cs @@ -0,0 +1,79 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Data.Entity; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.Core; + +namespace Tango.Integration.Observables +{ + /// + /// Represents an observable database entity. + /// + public interface IObservableEntity : IParameterized + { + /// + /// Occurs after this observable has been saved. + /// + event EventHandler Saved; + + /// + /// Gets or sets the entity identifier. + /// + [Column("ID")] + [DatabaseGeneratedAttribute(DatabaseGeneratedOption.Identity)] + Int32 ID { get; set; } + + /// + /// Gets or sets the entity unique identifier. + /// + [Key] + [Column("GUID")] + String Guid { get; set; } + + /// + /// Gets or sets the entity last updated data and time. + /// + [Column("LAST_UPDATED")] + DateTime LastUpdated { get; set; } + + /// + /// Saves the changes on this entity to database. + /// + void Save(); + + /// + /// Attaches this observable to the proper DbSet. + /// + void Attach(); + + /// + /// Detaches this observable from the proper DbSet. + /// + void Detach(); + + /// + /// Saves the changes on this entity to database asynchronously. + /// + /// + Task SaveAsync(); + + /// + /// Deletes this entity from the database. + /// + void Delete(); + + /// + /// Deletes this entity without saving changes to data base. + /// + void DefferedDelete(); + + /// + /// Deletes this entity from the database. + /// + Task DeleteAsync(); + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/ObservableEntity.cs b/Software/Visual_Studio/Tango.Integration/Observables/ObservableEntity.cs new file mode 100644 index 000000000..6ce7f0012 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/ObservableEntity.cs @@ -0,0 +1,253 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Data.Entity; +using System.Globalization; +using System.Linq; +using System.Reflection; +using System.Text; +using System.Text.RegularExpressions; +using System.Threading.Tasks; +using Tango.Core; +using Tango.DAL.Remote.DB; +using Tango.DAL.Remote; +using Tango.Settings; +using Tango.Core.Helpers; +using System.ComponentModel.DataAnnotations.Schema; +using System.ComponentModel.DataAnnotations; +using System.Runtime.CompilerServices; + +namespace Tango.Integration.Observables +{ + /// + /// Represents a generic observable entity base class. + /// + /// + /// + /// + public abstract class ObservableEntity : ExtendedObject, IObservableEntity where T : class, IObservableEntity + { + private Regex regExDAL; + + /// + /// Occurs after this observable has been saved. + /// + public event EventHandler Saved; + + private Int32 _id; + /// + /// Gets or sets the entity identifier. + /// + [Column("ID")] + [DatabaseGeneratedAttribute(DatabaseGeneratedOption.Identity)] + public Int32 ID + { + get { return _id; } + set { _id = value; RaisePropertyChanged(nameof(ID)); } + } + + private String _guid; + /// + /// Gets or sets the entity unique identifier. + /// + [Key] + [Column("GUID")] + public String Guid + { + get { return _guid; } + set { _guid = value; RaisePropertyChanged(nameof(Guid)); } + } + + private DateTime _lastUpdated; + /// + /// Gets or sets the entity last updated data and time. + /// + [Column("LAST_UPDATED")] + public DateTime LastUpdated + { + get { return _lastUpdated; } + set { _lastUpdated = value; RaisePropertyChanged(nameof(LastUpdated)); } + } + + private ReadOnlyObservableCollection _parameters; + /// + /// Gets a bind-able observable collection of the component properties. + /// + [NotMapped] + public ReadOnlyObservableCollection Parameters + { + get { return _parameters; } + set { _parameters = value; RaisePropertyChangedAuto(); } + } + + /// + /// Initializes a new instance of the class. + /// + public ObservableEntity() + { + Guid = System.Guid.NewGuid().ToString(); + LastUpdated = DateTime.UtcNow; + regExDAL = new Regex(@" + (?<=[A-Z])(?=[A-Z][a-z]) | + (?<=[^A-Z])(?=[A-Z]) | + (?<=[A-Za-z])(?=[^A-Za-z])", RegexOptions.IgnorePatternWhitespace); + + if (!DesignMode) + { + ThreadsHelper.InvokeUI(() => + { + Parameters = new ReadOnlyObservableCollection(this.CreateParametersCollection(ParameterItemMode.Binding)); + }); + } + } + + /// + /// Saves the changes on this entity to database. + /// + public virtual void Save() + { + ObservablesEntitiesAdapter.Instance.SaveChanges(); + Saved?.Invoke(this, new EventArgs()); + } + + /// + /// Attaches this entity to the proper DbSet. + /// + public virtual void Attach() + { + GetDbSet().Add(this as T); + } + + /// + /// Detaches this observable from the proper DbSet. + /// + public virtual void Detach() + { + GetDbSet().Remove(this as T); + } + + /// + /// Saves the changes on this entity to database asynchronously. + /// + /// + public Task SaveAsync() + { + return Task.Factory.StartNew(() => + { + Save(); + }); + } + + /// + /// Deletes this entity from the database + /// + public virtual void Delete() + { + var delProp = this.GetType().GetProperty("Deleted"); + + if (delProp != null) + { + delProp.SetValue(this, true); + Save(); + } + else + { + GetDbSet().Remove(this as T); + Save(); + } + } + + /// + /// Deletes this entity without saving changes to data base. + /// + public virtual void DefferedDelete() + { + GetDbSet().Remove(this as T); + } + + /// + /// Deletes this entity from the database + /// + public Task DeleteAsync() + { + return Task.Factory.StartNew(() => + { + Delete(); + }); + } + + /// + /// Gets the observable database set. + /// + /// + public DbSet GetDbSet() + { + String tabelName = this.GetType().Name.PluralizeMVC(); + var p = typeof(ObservablesContext).GetProperty(tabelName); + if (p != null) + { + var set1 = p.GetValue(ObservablesEntitiesAdapter.Instance.Context) as DbSet; + return set1; + } + else + { + tabelName = this.GetType().BaseType.Name.PluralizeMVC(); + p = typeof(ObservablesContext).GetProperty(tabelName); + if (p != null) + { + var set2 = p.GetValue(ObservablesEntitiesAdapter.Instance.Context) as DbSet; + return set2; + } + } + + return null; + } + + #region Operator Overloading + + //public static bool operator ==(ObservableEntityBase observable1, ObservableEntityBase observable2) + //{ + // if (object.ReferenceEquals(observable1, null) || object.ReferenceEquals(observable2, null)) + // { + // return object.ReferenceEquals(observable1, observable2); + // } + + // return observable1.Guid.ToLower() == observable2.Guid.ToLower(); + //} + + //public static bool operator !=(ObservableEntityBase observable1, ObservableEntityBase observable2) + //{ + // if (object.ReferenceEquals(observable1, null) || object.ReferenceEquals(observable2, null)) + // { + // return !object.ReferenceEquals(observable1, observable2); + // } + + // return observable1.Guid.ToLower() != observable2.Guid.ToLower(); + //} + + //public override bool Equals(object obj) + //{ + // if (object.ReferenceEquals(this, null) || object.ReferenceEquals(obj, null)) + // { + // return object.ReferenceEquals(this, obj); + // } + + // if (obj is ObservableEntityBase) + // { + // return Guid.ToLower() == (obj as ObservableEntityBase).Guid.ToLower(); + // } + // else + // { + // return false; + // } + //} + + public override int GetHashCode() + { + return base.GetHashCode(); + } + + #endregion + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/ObservablesContext.cs b/Software/Visual_Studio/Tango.Integration/Observables/ObservablesContext.cs new file mode 100644 index 000000000..42b650dc8 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/ObservablesContext.cs @@ -0,0 +1,451 @@ +using System; +using System.Collections.Generic; +using System.Data.Entity; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.Settings; + +namespace Tango.Integration.Observables +{ + public class ObservablesContext : DbContext + { + /// + /// Initializes a new instance of the class. + /// + /// The server file path. + /// if set to true will try to connect to an .mdf file. + public ObservablesContext(String path, bool isFile) : base(ComposeConnectionString(path, isFile)) + { + + } + + /// + /// Composes the connection string. + /// + /// The source. + /// if set to true [is file]. + /// + private static String ComposeConnectionString(String source, bool isFile) + { + if (!isFile) + { + return String.Format("Data Source={0};Initial Catalog=Tango;Integrated Security=true", source); + } + else + { + return null; + } + } + + /// + /// Creates a default remote database context by the address specified in . + /// + /// + public static ObservablesContext CreateDefault() + { + return new ObservablesContext(SettingsManager.Default.DataBase.SQLServerAddress, false); + } + + /// + /// Gets or sets the ActionTypes. + /// + public DbSet ActionTypes + { + get; set; + } + + /// + /// Gets or sets the Addresses. + /// + public DbSet
Addresses + { + get; set; + } + + /// + /// Gets or sets the ApplicationDisplayPanelVersions. + /// + public DbSet ApplicationDisplayPanelVersions + { + get; set; + } + + /// + /// Gets or sets the ApplicationFirmwareVersions. + /// + public DbSet ApplicationFirmwareVersions + { + get; set; + } + + /// + /// Gets or sets the ApplicationOsVersions. + /// + public DbSet ApplicationOsVersions + { + get; set; + } + + /// + /// Gets or sets the ApplicationVersions. + /// + public DbSet ApplicationVersions + { + get; set; + } + + /// + /// Gets or sets the BrushStops. + /// + public DbSet BrushStops + { + get; set; + } + + /// + /// Gets or sets the CartridgeTypes. + /// + public DbSet CartridgeTypes + { + get; set; + } + + /// + /// Gets or sets the Cats. + /// + public DbSet Cats + { + get; set; + } + + /// + /// Gets or sets the Ccts. + /// + public DbSet Ccts + { + get; set; + } + + /// + /// Gets or sets the ColorSpaces. + /// + public DbSet ColorSpaces + { + get; set; + } + + /// + /// Gets or sets the Configurations. + /// + public DbSet Configurations + { + get; set; + } + + /// + /// Gets or sets the Contacts. + /// + public DbSet Contacts + { + get; set; + } + + /// + /// Gets or sets the DispenserTypes. + /// + public DbSet DispenserTypes + { + get; set; + } + + /// + /// Gets or sets the EmbeddedFirmwareVersions. + /// + public DbSet EmbeddedFirmwareVersions + { + get; set; + } + + /// + /// Gets or sets the EmbeddedSoftwareVersions. + /// + public DbSet EmbeddedSoftwareVersions + { + get; set; + } + + /// + /// Gets or sets the EventTypes. + /// + public DbSet EventTypes + { + get; set; + } + + /// + /// Gets or sets the EventTypesActions. + /// + public DbSet EventTypesActions + { + get; set; + } + + /// + /// Gets or sets the FiberShapes. + /// + public DbSet FiberShapes + { + get; set; + } + + /// + /// Gets or sets the FiberSynths. + /// + public DbSet FiberSynths + { + get; set; + } + + /// + /// Gets or sets the HardwareVersions. + /// + public DbSet HardwareVersions + { + get; set; + } + + /// + /// Gets or sets the IdsPackFormulas. + /// + public DbSet IdsPackFormulas + { + get; set; + } + + /// + /// Gets or sets the IdsPacks. + /// + public DbSet IdsPacks + { + get; set; + } + + /// + /// Gets or sets the JobRuns. + /// + public DbSet JobRuns + { + get; set; + } + + /// + /// Gets or sets the Jobs. + /// + public DbSet Jobs + { + get; set; + } + + /// + /// Gets or sets the LinearMassDensityUnits. + /// + public DbSet LinearMassDensityUnits + { + get; set; + } + + /// + /// Gets or sets the LiquidTypes. + /// + public DbSet LiquidTypes + { + get; set; + } + + /// + /// Gets or sets the LiquidTypesRmls. + /// + public DbSet LiquidTypesRmls + { + get; set; + } + + /// + /// Gets or sets the MachineVersions. + /// + public DbSet MachineVersions + { + get; set; + } + + /// + /// Gets or sets the Machines. + /// + public DbSet Machines + { + get; set; + } + + /// + /// Gets or sets the MachinesConfigurations. + /// + public DbSet MachinesConfigurations + { + get; set; + } + + /// + /// Gets or sets the MachinesEvents. + /// + public DbSet MachinesEvents + { + get; set; + } + + /// + /// Gets or sets the MediaColors. + /// + public DbSet MediaColors + { + get; set; + } + + /// + /// Gets or sets the MediaConditions. + /// + public DbSet MediaConditions + { + get; set; + } + + /// + /// Gets or sets the MediaMaterials. + /// + public DbSet MediaMaterials + { + get; set; + } + + /// + /// Gets or sets the MediaPurposes. + /// + public DbSet MediaPurposes + { + get; set; + } + + /// + /// Gets or sets the MidTankTypes. + /// + public DbSet MidTankTypes + { + get; set; + } + + /// + /// Gets or sets the Organizations. + /// + public DbSet Organizations + { + get; set; + } + + /// + /// Gets or sets the Permissions. + /// + public DbSet Permissions + { + get; set; + } + + /// + /// Gets or sets the ProcessParametersTables. + /// + public DbSet ProcessParametersTables + { + get; set; + } + + /// + /// Gets or sets the ProcessParametersTablesGroups. + /// + public DbSet ProcessParametersTablesGroups + { + get; set; + } + + /// + /// Gets or sets the Rmls. + /// + public DbSet Rmls + { + get; set; + } + + /// + /// Gets or sets the Roles. + /// + public DbSet Roles + { + get; set; + } + + /// + /// Gets or sets the RolesPermissions. + /// + public DbSet RolesPermissions + { + get; set; + } + + /// + /// Gets or sets the Segments. + /// + public DbSet Segments + { + get; set; + } + + /// + /// Gets or sets the Sensors. + /// + public DbSet Sensors + { + get; set; + } + + /// + /// Gets or sets the SyncConfigurations. + /// + public DbSet SyncConfigurations + { + get; set; + } + + /// + /// Gets or sets the Users. + /// + public DbSet Users + { + get; set; + } + + /// + /// Gets or sets the UsersRoles. + /// + public DbSet UsersRoles + { + get; set; + } + + /// + /// Gets or sets the WindingMethods. + /// + public DbSet WindingMethods + { + get; set; + } + + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/ObservablesEntitiesAdapter.cs b/Software/Visual_Studio/Tango.Integration/Observables/ObservablesEntitiesAdapter.cs new file mode 100644 index 000000000..768da617e --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/ObservablesEntitiesAdapter.cs @@ -0,0 +1,298 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel; +using System.Data.Entity; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Data; +using System.Windows.Threading; +using Tango.Core; +using Tango.DAL.Remote.DB; +using Tango.Settings; + +namespace Tango.Integration.Observables +{ + /// + /// Exposes method for retrieving observable collections of observable entities. + /// + /// + public partial class ObservablesEntitiesAdapter : ExtendedObject + { + public event Action Initialized; + + private static object _syncLock; + + private static ObservablesEntitiesAdapter _instance; + /// + /// Gets the singleton instance. + /// + public static ObservablesEntitiesAdapter Instance + { + get + { + if (_instance == null) + { + _instance = new ObservablesEntitiesAdapter(); + } + return _instance; + } + } + + /// + /// Gets the DB context. + /// + public ObservablesContext Context { get; private set; } + + /// + /// Performs an implicit conversion from to . + /// + /// The instance. + /// + /// The result of the conversion. + /// + public static implicit operator DbContext(ObservablesEntitiesAdapter instance) + { + return instance.Context; + } + + /// + /// Prevents a default instance of the class from being created. + /// + private ObservablesEntitiesAdapter() + { + Context = new ObservablesContext(SettingsManager.Default.DataBase.SQLServerAddress, false); + } + + /// + /// Initializes this instance. + /// + public void Initialize() + { + Invalidate(true); + Initialized?.Invoke(); + } + + /// + /// Saves the current changes to database. + /// + public void SaveChanges() + { + try + { + Context.SaveChanges(); + } + catch (Exception ex) + { + throw ex; + } + finally + { + Invalidate(); + } + } + + /// + /// Invokes the specified action on the adapter synchronization context. + /// + /// The action. + public void Invoke(Action action) + { + lock (_syncLock) + { + action(); + } + } + + /// + /// Invalidates the adapter and reloads the database. + /// + /// if set to true [initializing]. + public void Invalidate(bool initializing = false) + { + _syncLock = new object(); + + if (initializing) + { + //Remove Unlinked Configurations.. + List remove_configurations = new List(); + + foreach (var config in Context.Configurations) + { + if (Context.MachineVersions.FirstOrDefault(x => x.DefaultConfigurationGuid == config.Guid) != null) + { + continue; + } + + if (Context.MachinesConfigurations.FirstOrDefault(x => x.ConfigurationGuid == config.Guid) != null) + { + continue; + } + + if (Context.Machines.FirstOrDefault(x => x.ConfigurationGuid == config.Guid) != null) + { + continue; + } + + remove_configurations.Add(config); + } + + foreach (var config in remove_configurations) + { + Context.Configurations.Remove(config); + } + + Context.SaveChanges(); + //Remove Unlinked Configurations.. + } + + Organizations = Context.Organizations.ToObservableCollection(); + + Machines = Context.Machines.ToObservableCollection(); + + foreach (var machine in Machines) + { + machine.MachinesConfigurations = machine.MachinesConfigurations.OrderByDescending(x => x.Configuration.CreationDate).Take(30).ToObservableCollection(); + machine.Jobs = machine.Jobs.OrderByDescending(x => x.CreationDate).ToObservableCollection(); + } + + MachinesConfigurations = Context.MachinesConfigurations.ToObservableCollection(); + + MachineVersions = Context.MachineVersions.ToList().OrderBy(x => x.Version).ToObservableCollection(); + + Addresses = Context.Addresses.Where(x => !x.Deleted).ToList().OrderBy(x => x.AddressString).ToObservableCollection(); + Contacts = Context.Contacts.Where(x => !x.Deleted).ToList().OrderBy(x => x.FullName).ToObservableCollection(); + + Roles = Context.Roles.ToList().OrderBy(x => x.Name).ToObservableCollection(); + + Permissions = Context.Permissions.ToList().OrderBy(x => x.Name).ToObservableCollection(); + + UsersRoles = Context.UsersRoles.ToObservableCollection(); + + Users = Context.Users.Where(x => !x.Deleted).ToList().OrderBy(x => x.Contact.FullName).ToObservableCollection(); + + //foreach (var user in Users) + //{ + // user.UsersRoles = user.UsersRoles.Where(x => !x.Deleted).ToObservableCollection(); + //} + + foreach (var role in Roles) + { + role.RolesPermissions = role.RolesPermissions.ToObservableCollection(); + } + + Configurations = Context.Configurations.ToList().OrderBy(x => x.LastUpdated).ToObservableCollection(); + + foreach (var config in Configurations) + { + config.IdsPacks = config.IdsPacks.ToObservableCollection(); + } + + ApplicationVersions = Context.ApplicationVersions.ToList().OrderBy(x => x.Version).ToObservableCollection(); + + ApplicationOsVersions = Context.ApplicationOsVersions.ToList().OrderBy(x => x.Version).ToObservableCollection(); + + ApplicationFirmwareVersions = Context.ApplicationFirmwareVersions.ToList().OrderBy(x => x.Version).ToObservableCollection(); + + ApplicationDisplayPanelVersions = Context.ApplicationDisplayPanelVersions.ToList().OrderBy(x => x.Version).ToObservableCollection(); + + EmbeddedFirmwareVersions = Context.EmbeddedFirmwareVersions.ToList().OrderBy(x => x.Version).ToObservableCollection(); + + EmbeddedSoftwareVersions = Context.EmbeddedSoftwareVersions.ToList().OrderBy(x => x.Version).ToObservableCollection(); + + HardwareVersions = Context.HardwareVersions.ToList().OrderBy(x => x.Version).ToObservableCollection(); + + IdsPacks = Context.IdsPacks.ToObservableCollection(); + + DispenserTypes = Context.DispenserTypes.ToObservableCollection(); + + LiquidTypes = Context.LiquidTypes.ToObservableCollection(); + + CartridgeTypes = Context.CartridgeTypes.ToObservableCollection(); + + MidTankTypes = Context.MidTankTypes.ToObservableCollection(); + + ActionTypes = Context.ActionTypes.ToObservableCollection(); + + EventTypesActions = Context.EventTypesActions.ToObservableCollection(); + + EventTypes = Context.EventTypes.ToObservableCollection(); + + foreach (var eventType in EventTypes) + { + eventType.EventTypesActions = eventType.EventTypesActions.ToObservableCollection(); + } + + MediaMaterials = Context.MediaMaterials.ToObservableCollection(); + + MediaColors = Context.MediaColors.ToObservableCollection(); + + MediaPurposes = Context.MediaPurposes.ToObservableCollection(); + + MediaConditions = Context.MediaConditions.ToObservableCollection(); + + LinearMassDensityUnits = Context.LinearMassDensityUnits.ToObservableCollection(); + + FiberShapes = Context.FiberShapes.ToObservableCollection(); + + FiberSynths = Context.FiberSynths.ToObservableCollection(); + + Rmls = Context.Rmls.ToObservableCollection(); + + LiquidTypesRmls = Context.LiquidTypesRmls.ToObservableCollection(); + + Ccts = Context.Ccts.ToObservableCollection(); + + Cats = Context.Cats.ToObservableCollection(); + + ProcessParametersTables = Context.ProcessParametersTables.ToObservableCollection(); + + ProcessParametersTablesGroups = Context.ProcessParametersTablesGroups.ToObservableCollection(); + + foreach (var group in ProcessParametersTablesGroups) + { + group.ProcessParametersTables = group.ProcessParametersTables.OrderBy(x => x.TableIndex).ToObservableCollection(); + } + + WindingMethods = Context.WindingMethods.ToObservableCollection(); + + Sensors = Context.Sensors.ToObservableCollection(); + + IdsPackFormulas = Context.IdsPackFormulas.ToObservableCollection(); + + ColorSpaces = Context.ColorSpaces.ToObservableCollection(); + + InitCollectionSources(); + + //var action = ActionTypes.First(); + + //action.Name = "Action 1 Yesss"; + + //SaveChanges(); + + //BindingOperations.EnableCollectionSynchronization(Machines, _syncLock); + //BindingOperations.EnableCollectionSynchronization(MachinesViewSource, _syncLock); + + //BindingOperations.EnableCollectionSynchronization(MachinesConfigurations, _syncLock); + //BindingOperations.EnableCollectionSynchronization(MachinesConfigurationsViewSource, _syncLock); + + //BindingOperations.EnableCollectionSynchronization(EventTypesActions, _syncLock); + //BindingOperations.EnableCollectionSynchronization(EventTypesActionsViewSource, _syncLock); + } + + /// + /// Creates a collection view from the specified observable collection. + /// + /// + /// The collection. + /// + private ICollectionView CreateCollectionView(ObservableCollection collection) + { + var view = CollectionViewSource.GetDefaultView(collection); + return view; + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/ObservablesEntitiesAdapterExtension.cs b/Software/Visual_Studio/Tango.Integration/Observables/ObservablesEntitiesAdapterExtension.cs new file mode 100644 index 000000000..ad549d916 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/ObservablesEntitiesAdapterExtension.cs @@ -0,0 +1,1917 @@ +using System.Collections.ObjectModel; +using System.ComponentModel; + +namespace Tango.Integration.Observables +{ + public partial class ObservablesEntitiesAdapter + { + + 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. + /// + public ObservableCollection
Addresses + { + get + { + return _addresses; + } + + set + { + _addresses = value; RaisePropertyChanged(nameof(Addresses)); + } + + } + + private ICollectionView _addressesViewSource; + /// + /// Gets or sets the Addresses View Source. + /// + public ICollectionView AddressesViewSource + { + get + { + return _addressesViewSource; + } + + set + { + _addressesViewSource = value; RaisePropertyChanged(nameof(AddressesViewSource)); + } + + } + + private ObservableCollection _applicationdisplaypanelversions; + /// + /// Gets or sets the ApplicationDisplayPanelVersions. + /// + public ObservableCollection ApplicationDisplayPanelVersions + { + get + { + return _applicationdisplaypanelversions; + } + + set + { + _applicationdisplaypanelversions = value; RaisePropertyChanged(nameof(ApplicationDisplayPanelVersions)); + } + + } + + private ICollectionView _applicationdisplaypanelversionsViewSource; + /// + /// Gets or sets the ApplicationDisplayPanelVersions View Source. + /// + public ICollectionView ApplicationDisplayPanelVersionsViewSource + { + get + { + return _applicationdisplaypanelversionsViewSource; + } + + set + { + _applicationdisplaypanelversionsViewSource = value; RaisePropertyChanged(nameof(ApplicationDisplayPanelVersionsViewSource)); + } + + } + + private ObservableCollection _applicationfirmwareversions; + /// + /// Gets or sets the ApplicationFirmwareVersions. + /// + public ObservableCollection ApplicationFirmwareVersions + { + get + { + return _applicationfirmwareversions; + } + + set + { + _applicationfirmwareversions = value; RaisePropertyChanged(nameof(ApplicationFirmwareVersions)); + } + + } + + private ICollectionView _applicationfirmwareversionsViewSource; + /// + /// Gets or sets the ApplicationFirmwareVersions View Source. + /// + public ICollectionView ApplicationFirmwareVersionsViewSource + { + get + { + return _applicationfirmwareversionsViewSource; + } + + set + { + _applicationfirmwareversionsViewSource = value; RaisePropertyChanged(nameof(ApplicationFirmwareVersionsViewSource)); + } + + } + + private ObservableCollection _applicationosversions; + /// + /// Gets or sets the ApplicationOsVersions. + /// + public ObservableCollection ApplicationOsVersions + { + get + { + return _applicationosversions; + } + + set + { + _applicationosversions = value; RaisePropertyChanged(nameof(ApplicationOsVersions)); + } + + } + + private ICollectionView _applicationosversionsViewSource; + /// + /// Gets or sets the ApplicationOsVersions View Source. + /// + public ICollectionView ApplicationOsVersionsViewSource + { + get + { + return _applicationosversionsViewSource; + } + + set + { + _applicationosversionsViewSource = value; RaisePropertyChanged(nameof(ApplicationOsVersionsViewSource)); + } + + } + + private ObservableCollection _applicationversions; + /// + /// Gets or sets the ApplicationVersions. + /// + public ObservableCollection ApplicationVersions + { + get + { + return _applicationversions; + } + + set + { + _applicationversions = value; RaisePropertyChanged(nameof(ApplicationVersions)); + } + + } + + private ICollectionView _applicationversionsViewSource; + /// + /// Gets or sets the ApplicationVersions View Source. + /// + public ICollectionView ApplicationVersionsViewSource + { + get + { + return _applicationversionsViewSource; + } + + set + { + _applicationversionsViewSource = value; RaisePropertyChanged(nameof(ApplicationVersionsViewSource)); + } + + } + + private ObservableCollection _brushstops; + /// + /// Gets or sets the BrushStops. + /// + public ObservableCollection BrushStops + { + get + { + return _brushstops; + } + + set + { + _brushstops = value; RaisePropertyChanged(nameof(BrushStops)); + } + + } + + private ICollectionView _brushstopsViewSource; + /// + /// Gets or sets the BrushStops View Source. + /// + public ICollectionView BrushStopsViewSource + { + get + { + return _brushstopsViewSource; + } + + set + { + _brushstopsViewSource = value; RaisePropertyChanged(nameof(BrushStopsViewSource)); + } + + } + + private ObservableCollection _cartridgetypes; + /// + /// Gets or sets the CartridgeTypes. + /// + public ObservableCollection CartridgeTypes + { + get + { + return _cartridgetypes; + } + + set + { + _cartridgetypes = value; RaisePropertyChanged(nameof(CartridgeTypes)); + } + + } + + private ICollectionView _cartridgetypesViewSource; + /// + /// Gets or sets the CartridgeTypes View Source. + /// + public ICollectionView CartridgeTypesViewSource + { + get + { + return _cartridgetypesViewSource; + } + + set + { + _cartridgetypesViewSource = value; RaisePropertyChanged(nameof(CartridgeTypesViewSource)); + } + + } + + private ObservableCollection _cats; + /// + /// Gets or sets the Cats. + /// + public ObservableCollection Cats + { + get + { + return _cats; + } + + set + { + _cats = value; RaisePropertyChanged(nameof(Cats)); + } + + } + + private ICollectionView _catsViewSource; + /// + /// Gets or sets the Cats View Source. + /// + public ICollectionView CatsViewSource + { + get + { + return _catsViewSource; + } + + set + { + _catsViewSource = value; RaisePropertyChanged(nameof(CatsViewSource)); + } + + } + + private ObservableCollection _ccts; + /// + /// Gets or sets the Ccts. + /// + public ObservableCollection Ccts + { + get + { + return _ccts; + } + + set + { + _ccts = value; RaisePropertyChanged(nameof(Ccts)); + } + + } + + private ICollectionView _cctsViewSource; + /// + /// Gets or sets the Ccts View Source. + /// + public ICollectionView CctsViewSource + { + get + { + return _cctsViewSource; + } + + set + { + _cctsViewSource = value; RaisePropertyChanged(nameof(CctsViewSource)); + } + + } + + private ObservableCollection _colorspaces; + /// + /// Gets or sets the ColorSpaces. + /// + public ObservableCollection ColorSpaces + { + get + { + return _colorspaces; + } + + set + { + _colorspaces = value; RaisePropertyChanged(nameof(ColorSpaces)); + } + + } + + private ICollectionView _colorspacesViewSource; + /// + /// Gets or sets the ColorSpaces View Source. + /// + public ICollectionView ColorSpacesViewSource + { + get + { + return _colorspacesViewSource; + } + + set + { + _colorspacesViewSource = value; RaisePropertyChanged(nameof(ColorSpacesViewSource)); + } + + } + + private ObservableCollection _configurations; + /// + /// Gets or sets the Configurations. + /// + public ObservableCollection Configurations + { + get + { + return _configurations; + } + + set + { + _configurations = value; RaisePropertyChanged(nameof(Configurations)); + } + + } + + private ICollectionView _configurationsViewSource; + /// + /// Gets or sets the Configurations View Source. + /// + public ICollectionView ConfigurationsViewSource + { + get + { + return _configurationsViewSource; + } + + set + { + _configurationsViewSource = value; RaisePropertyChanged(nameof(ConfigurationsViewSource)); + } + + } + + private ObservableCollection _contacts; + /// + /// Gets or sets the Contacts. + /// + public ObservableCollection Contacts + { + get + { + return _contacts; + } + + set + { + _contacts = value; RaisePropertyChanged(nameof(Contacts)); + } + + } + + private ICollectionView _contactsViewSource; + /// + /// Gets or sets the Contacts View Source. + /// + public ICollectionView ContactsViewSource + { + get + { + return _contactsViewSource; + } + + set + { + _contactsViewSource = value; RaisePropertyChanged(nameof(ContactsViewSource)); + } + + } + + private ObservableCollection _dispensertypes; + /// + /// Gets or sets the DispenserTypes. + /// + public ObservableCollection DispenserTypes + { + get + { + return _dispensertypes; + } + + set + { + _dispensertypes = value; RaisePropertyChanged(nameof(DispenserTypes)); + } + + } + + private ICollectionView _dispensertypesViewSource; + /// + /// Gets or sets the DispenserTypes View Source. + /// + public ICollectionView DispenserTypesViewSource + { + get + { + return _dispensertypesViewSource; + } + + set + { + _dispensertypesViewSource = value; RaisePropertyChanged(nameof(DispenserTypesViewSource)); + } + + } + + private ObservableCollection _embeddedfirmwareversions; + /// + /// Gets or sets the EmbeddedFirmwareVersions. + /// + public ObservableCollection EmbeddedFirmwareVersions + { + get + { + return _embeddedfirmwareversions; + } + + set + { + _embeddedfirmwareversions = value; RaisePropertyChanged(nameof(EmbeddedFirmwareVersions)); + } + + } + + private ICollectionView _embeddedfirmwareversionsViewSource; + /// + /// Gets or sets the EmbeddedFirmwareVersions View Source. + /// + public ICollectionView EmbeddedFirmwareVersionsViewSource + { + get + { + return _embeddedfirmwareversionsViewSource; + } + + set + { + _embeddedfirmwareversionsViewSource = value; RaisePropertyChanged(nameof(EmbeddedFirmwareVersionsViewSource)); + } + + } + + private ObservableCollection _embeddedsoftwareversions; + /// + /// Gets or sets the EmbeddedSoftwareVersions. + /// + public ObservableCollection EmbeddedSoftwareVersions + { + get + { + return _embeddedsoftwareversions; + } + + set + { + _embeddedsoftwareversions = value; RaisePropertyChanged(nameof(EmbeddedSoftwareVersions)); + } + + } + + private ICollectionView _embeddedsoftwareversionsViewSource; + /// + /// Gets or sets the EmbeddedSoftwareVersions View Source. + /// + public ICollectionView EmbeddedSoftwareVersionsViewSource + { + get + { + return _embeddedsoftwareversionsViewSource; + } + + set + { + _embeddedsoftwareversionsViewSource = value; RaisePropertyChanged(nameof(EmbeddedSoftwareVersionsViewSource)); + } + + } + + private ObservableCollection _eventtypes; + /// + /// Gets or sets the EventTypes. + /// + public ObservableCollection EventTypes + { + get + { + return _eventtypes; + } + + set + { + _eventtypes = value; RaisePropertyChanged(nameof(EventTypes)); + } + + } + + private ICollectionView _eventtypesViewSource; + /// + /// Gets or sets the EventTypes View Source. + /// + public ICollectionView EventTypesViewSource + { + get + { + return _eventtypesViewSource; + } + + set + { + _eventtypesViewSource = value; RaisePropertyChanged(nameof(EventTypesViewSource)); + } + + } + + 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 _fibershapes; + /// + /// Gets or sets the FiberShapes. + /// + public ObservableCollection FiberShapes + { + get + { + return _fibershapes; + } + + set + { + _fibershapes = value; RaisePropertyChanged(nameof(FiberShapes)); + } + + } + + private ICollectionView _fibershapesViewSource; + /// + /// Gets or sets the FiberShapes View Source. + /// + public ICollectionView FiberShapesViewSource + { + get + { + return _fibershapesViewSource; + } + + set + { + _fibershapesViewSource = value; RaisePropertyChanged(nameof(FiberShapesViewSource)); + } + + } + + private ObservableCollection _fibersynths; + /// + /// Gets or sets the FiberSynths. + /// + public ObservableCollection FiberSynths + { + get + { + return _fibersynths; + } + + set + { + _fibersynths = value; RaisePropertyChanged(nameof(FiberSynths)); + } + + } + + private ICollectionView _fibersynthsViewSource; + /// + /// Gets or sets the FiberSynths View Source. + /// + public ICollectionView FiberSynthsViewSource + { + get + { + return _fibersynthsViewSource; + } + + set + { + _fibersynthsViewSource = value; RaisePropertyChanged(nameof(FiberSynthsViewSource)); + } + + } + + private ObservableCollection _hardwareversions; + /// + /// Gets or sets the HardwareVersions. + /// + public ObservableCollection HardwareVersions + { + get + { + return _hardwareversions; + } + + set + { + _hardwareversions = value; RaisePropertyChanged(nameof(HardwareVersions)); + } + + } + + private ICollectionView _hardwareversionsViewSource; + /// + /// Gets or sets the HardwareVersions View Source. + /// + public ICollectionView HardwareVersionsViewSource + { + get + { + return _hardwareversionsViewSource; + } + + set + { + _hardwareversionsViewSource = value; RaisePropertyChanged(nameof(HardwareVersionsViewSource)); + } + + } + + private ObservableCollection _idspackformulas; + /// + /// Gets or sets the IdsPackFormulas. + /// + public ObservableCollection IdsPackFormulas + { + get + { + return _idspackformulas; + } + + set + { + _idspackformulas = value; RaisePropertyChanged(nameof(IdsPackFormulas)); + } + + } + + private ICollectionView _idspackformulasViewSource; + /// + /// Gets or sets the IdsPackFormulas View Source. + /// + public ICollectionView IdsPackFormulasViewSource + { + get + { + return _idspackformulasViewSource; + } + + set + { + _idspackformulasViewSource = value; RaisePropertyChanged(nameof(IdsPackFormulasViewSource)); + } + + } + + private ObservableCollection _idspacks; + /// + /// Gets or sets the IdsPacks. + /// + public ObservableCollection IdsPacks + { + get + { + return _idspacks; + } + + set + { + _idspacks = value; RaisePropertyChanged(nameof(IdsPacks)); + } + + } + + private ICollectionView _idspacksViewSource; + /// + /// Gets or sets the IdsPacks View Source. + /// + public ICollectionView IdsPacksViewSource + { + get + { + return _idspacksViewSource; + } + + set + { + _idspacksViewSource = value; RaisePropertyChanged(nameof(IdsPacksViewSource)); + } + + } + + private ObservableCollection _jobruns; + /// + /// Gets or sets the JobRuns. + /// + public ObservableCollection JobRuns + { + get + { + return _jobruns; + } + + set + { + _jobruns = value; RaisePropertyChanged(nameof(JobRuns)); + } + + } + + private ICollectionView _jobrunsViewSource; + /// + /// Gets or sets the JobRuns View Source. + /// + public ICollectionView JobRunsViewSource + { + get + { + return _jobrunsViewSource; + } + + set + { + _jobrunsViewSource = value; RaisePropertyChanged(nameof(JobRunsViewSource)); + } + + } + + private ObservableCollection _jobs; + /// + /// Gets or sets the Jobs. + /// + public ObservableCollection Jobs + { + get + { + return _jobs; + } + + set + { + _jobs = value; RaisePropertyChanged(nameof(Jobs)); + } + + } + + private ICollectionView _jobsViewSource; + /// + /// Gets or sets the Jobs View Source. + /// + public ICollectionView JobsViewSource + { + get + { + return _jobsViewSource; + } + + set + { + _jobsViewSource = value; RaisePropertyChanged(nameof(JobsViewSource)); + } + + } + + private ObservableCollection _linearmassdensityunits; + /// + /// Gets or sets the LinearMassDensityUnits. + /// + public ObservableCollection LinearMassDensityUnits + { + get + { + return _linearmassdensityunits; + } + + set + { + _linearmassdensityunits = value; RaisePropertyChanged(nameof(LinearMassDensityUnits)); + } + + } + + private ICollectionView _linearmassdensityunitsViewSource; + /// + /// Gets or sets the LinearMassDensityUnits View Source. + /// + public ICollectionView LinearMassDensityUnitsViewSource + { + get + { + return _linearmassdensityunitsViewSource; + } + + set + { + _linearmassdensityunitsViewSource = value; RaisePropertyChanged(nameof(LinearMassDensityUnitsViewSource)); + } + + } + + private ObservableCollection _liquidtypes; + /// + /// Gets or sets the LiquidTypes. + /// + public ObservableCollection LiquidTypes + { + get + { + return _liquidtypes; + } + + set + { + _liquidtypes = value; RaisePropertyChanged(nameof(LiquidTypes)); + } + + } + + private ICollectionView _liquidtypesViewSource; + /// + /// Gets or sets the LiquidTypes View Source. + /// + public ICollectionView LiquidTypesViewSource + { + get + { + return _liquidtypesViewSource; + } + + set + { + _liquidtypesViewSource = value; RaisePropertyChanged(nameof(LiquidTypesViewSource)); + } + + } + + private ObservableCollection _liquidtypesrmls; + /// + /// Gets or sets the LiquidTypesRmls. + /// + public ObservableCollection LiquidTypesRmls + { + get + { + return _liquidtypesrmls; + } + + set + { + _liquidtypesrmls = value; RaisePropertyChanged(nameof(LiquidTypesRmls)); + } + + } + + private ICollectionView _liquidtypesrmlsViewSource; + /// + /// Gets or sets the LiquidTypesRmls View Source. + /// + public ICollectionView LiquidTypesRmlsViewSource + { + get + { + return _liquidtypesrmlsViewSource; + } + + set + { + _liquidtypesrmlsViewSource = value; RaisePropertyChanged(nameof(LiquidTypesRmlsViewSource)); + } + + } + + private ObservableCollection _machineversions; + /// + /// Gets or sets the MachineVersions. + /// + public ObservableCollection MachineVersions + { + get + { + return _machineversions; + } + + set + { + _machineversions = value; RaisePropertyChanged(nameof(MachineVersions)); + } + + } + + private ICollectionView _machineversionsViewSource; + /// + /// Gets or sets the MachineVersions View Source. + /// + public ICollectionView MachineVersionsViewSource + { + get + { + return _machineversionsViewSource; + } + + set + { + _machineversionsViewSource = value; RaisePropertyChanged(nameof(MachineVersionsViewSource)); + } + + } + + private ObservableCollection _machines; + /// + /// Gets or sets the Machines. + /// + public ObservableCollection Machines + { + get + { + return _machines; + } + + set + { + _machines = value; RaisePropertyChanged(nameof(Machines)); + } + + } + + private ICollectionView _machinesViewSource; + /// + /// Gets or sets the Machines View Source. + /// + public ICollectionView MachinesViewSource + { + get + { + return _machinesViewSource; + } + + set + { + _machinesViewSource = value; RaisePropertyChanged(nameof(MachinesViewSource)); + } + + } + + private ObservableCollection _machinesconfigurations; + /// + /// Gets or sets the MachinesConfigurations. + /// + public ObservableCollection MachinesConfigurations + { + get + { + return _machinesconfigurations; + } + + set + { + _machinesconfigurations = value; RaisePropertyChanged(nameof(MachinesConfigurations)); + } + + } + + private ICollectionView _machinesconfigurationsViewSource; + /// + /// Gets or sets the MachinesConfigurations View Source. + /// + public ICollectionView MachinesConfigurationsViewSource + { + get + { + return _machinesconfigurationsViewSource; + } + + set + { + _machinesconfigurationsViewSource = value; RaisePropertyChanged(nameof(MachinesConfigurationsViewSource)); + } + + } + + private ObservableCollection _machinesevents; + /// + /// Gets or sets the MachinesEvents. + /// + public ObservableCollection MachinesEvents + { + get + { + return _machinesevents; + } + + set + { + _machinesevents = value; RaisePropertyChanged(nameof(MachinesEvents)); + } + + } + + private ICollectionView _machineseventsViewSource; + /// + /// Gets or sets the MachinesEvents View Source. + /// + public ICollectionView MachinesEventsViewSource + { + get + { + return _machineseventsViewSource; + } + + set + { + _machineseventsViewSource = value; RaisePropertyChanged(nameof(MachinesEventsViewSource)); + } + + } + + 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. + /// + public ObservableCollection MediaConditions + { + get + { + return _mediaconditions; + } + + set + { + _mediaconditions = value; RaisePropertyChanged(nameof(MediaConditions)); + } + + } + + private ICollectionView _mediaconditionsViewSource; + /// + /// Gets or sets the MediaConditions View Source. + /// + public ICollectionView MediaConditionsViewSource + { + get + { + return _mediaconditionsViewSource; + } + + set + { + _mediaconditionsViewSource = value; RaisePropertyChanged(nameof(MediaConditionsViewSource)); + } + + } + + private ObservableCollection _mediamaterials; + /// + /// Gets or sets the MediaMaterials. + /// + public ObservableCollection MediaMaterials + { + get + { + return _mediamaterials; + } + + set + { + _mediamaterials = value; RaisePropertyChanged(nameof(MediaMaterials)); + } + + } + + private ICollectionView _mediamaterialsViewSource; + /// + /// Gets or sets the MediaMaterials View Source. + /// + public ICollectionView MediaMaterialsViewSource + { + get + { + return _mediamaterialsViewSource; + } + + set + { + _mediamaterialsViewSource = value; RaisePropertyChanged(nameof(MediaMaterialsViewSource)); + } + + } + + private ObservableCollection _mediapurposes; + /// + /// Gets or sets the MediaPurposes. + /// + public ObservableCollection MediaPurposes + { + get + { + return _mediapurposes; + } + + set + { + _mediapurposes = value; RaisePropertyChanged(nameof(MediaPurposes)); + } + + } + + private ICollectionView _mediapurposesViewSource; + /// + /// Gets or sets the MediaPurposes View Source. + /// + public ICollectionView MediaPurposesViewSource + { + get + { + return _mediapurposesViewSource; + } + + set + { + _mediapurposesViewSource = value; RaisePropertyChanged(nameof(MediaPurposesViewSource)); + } + + } + + private ObservableCollection _midtanktypes; + /// + /// Gets or sets the MidTankTypes. + /// + public ObservableCollection MidTankTypes + { + get + { + return _midtanktypes; + } + + set + { + _midtanktypes = value; RaisePropertyChanged(nameof(MidTankTypes)); + } + + } + + private ICollectionView _midtanktypesViewSource; + /// + /// Gets or sets the MidTankTypes View Source. + /// + public ICollectionView MidTankTypesViewSource + { + get + { + return _midtanktypesViewSource; + } + + set + { + _midtanktypesViewSource = value; RaisePropertyChanged(nameof(MidTankTypesViewSource)); + } + + } + + private ObservableCollection _organizations; + /// + /// Gets or sets the Organizations. + /// + public ObservableCollection Organizations + { + get + { + return _organizations; + } + + set + { + _organizations = value; RaisePropertyChanged(nameof(Organizations)); + } + + } + + private ICollectionView _organizationsViewSource; + /// + /// Gets or sets the Organizations View Source. + /// + public ICollectionView OrganizationsViewSource + { + get + { + return _organizationsViewSource; + } + + set + { + _organizationsViewSource = value; RaisePropertyChanged(nameof(OrganizationsViewSource)); + } + + } + + private ObservableCollection _permissions; + /// + /// Gets or sets the Permissions. + /// + public ObservableCollection Permissions + { + get + { + return _permissions; + } + + set + { + _permissions = value; RaisePropertyChanged(nameof(Permissions)); + } + + } + + private ICollectionView _permissionsViewSource; + /// + /// Gets or sets the Permissions View Source. + /// + public ICollectionView PermissionsViewSource + { + get + { + return _permissionsViewSource; + } + + set + { + _permissionsViewSource = value; RaisePropertyChanged(nameof(PermissionsViewSource)); + } + + } + + private ObservableCollection _processparameterstables; + /// + /// Gets or sets the ProcessParametersTables. + /// + public ObservableCollection ProcessParametersTables + { + get + { + return _processparameterstables; + } + + set + { + _processparameterstables = value; RaisePropertyChanged(nameof(ProcessParametersTables)); + } + + } + + private ICollectionView _processparameterstablesViewSource; + /// + /// Gets or sets the ProcessParametersTables View Source. + /// + public ICollectionView ProcessParametersTablesViewSource + { + get + { + return _processparameterstablesViewSource; + } + + set + { + _processparameterstablesViewSource = value; RaisePropertyChanged(nameof(ProcessParametersTablesViewSource)); + } + + } + + private ObservableCollection _processparameterstablesgroups; + /// + /// Gets or sets the ProcessParametersTablesGroups. + /// + public ObservableCollection ProcessParametersTablesGroups + { + get + { + return _processparameterstablesgroups; + } + + set + { + _processparameterstablesgroups = value; RaisePropertyChanged(nameof(ProcessParametersTablesGroups)); + } + + } + + private ICollectionView _processparameterstablesgroupsViewSource; + /// + /// Gets or sets the ProcessParametersTablesGroups View Source. + /// + public ICollectionView ProcessParametersTablesGroupsViewSource + { + get + { + return _processparameterstablesgroupsViewSource; + } + + set + { + _processparameterstablesgroupsViewSource = value; RaisePropertyChanged(nameof(ProcessParametersTablesGroupsViewSource)); + } + + } + + private ObservableCollection _rmls; + /// + /// Gets or sets the Rmls. + /// + public ObservableCollection Rmls + { + get + { + return _rmls; + } + + set + { + _rmls = value; RaisePropertyChanged(nameof(Rmls)); + } + + } + + private ICollectionView _rmlsViewSource; + /// + /// Gets or sets the Rmls View Source. + /// + public ICollectionView RmlsViewSource + { + get + { + return _rmlsViewSource; + } + + set + { + _rmlsViewSource = value; RaisePropertyChanged(nameof(RmlsViewSource)); + } + + } + + private ObservableCollection _roles; + /// + /// Gets or sets the Roles. + /// + public ObservableCollection Roles + { + get + { + return _roles; + } + + set + { + _roles = value; RaisePropertyChanged(nameof(Roles)); + } + + } + + private ICollectionView _rolesViewSource; + /// + /// Gets or sets the Roles View Source. + /// + public ICollectionView RolesViewSource + { + get + { + return _rolesViewSource; + } + + set + { + _rolesViewSource = value; RaisePropertyChanged(nameof(RolesViewSource)); + } + + } + + private ObservableCollection _rolespermissions; + /// + /// Gets or sets the RolesPermissions. + /// + public ObservableCollection RolesPermissions + { + get + { + return _rolespermissions; + } + + set + { + _rolespermissions = value; RaisePropertyChanged(nameof(RolesPermissions)); + } + + } + + private ICollectionView _rolespermissionsViewSource; + /// + /// Gets or sets the RolesPermissions View Source. + /// + public ICollectionView RolesPermissionsViewSource + { + get + { + return _rolespermissionsViewSource; + } + + set + { + _rolespermissionsViewSource = value; RaisePropertyChanged(nameof(RolesPermissionsViewSource)); + } + + } + + private ObservableCollection _segments; + /// + /// Gets or sets the Segments. + /// + public ObservableCollection Segments + { + get + { + return _segments; + } + + set + { + _segments = value; RaisePropertyChanged(nameof(Segments)); + } + + } + + private ICollectionView _segmentsViewSource; + /// + /// Gets or sets the Segments View Source. + /// + public ICollectionView SegmentsViewSource + { + get + { + return _segmentsViewSource; + } + + set + { + _segmentsViewSource = value; RaisePropertyChanged(nameof(SegmentsViewSource)); + } + + } + + private ObservableCollection _sensors; + /// + /// Gets or sets the Sensors. + /// + public ObservableCollection Sensors + { + get + { + return _sensors; + } + + set + { + _sensors = value; RaisePropertyChanged(nameof(Sensors)); + } + + } + + private ICollectionView _sensorsViewSource; + /// + /// Gets or sets the Sensors View Source. + /// + public ICollectionView SensorsViewSource + { + get + { + return _sensorsViewSource; + } + + set + { + _sensorsViewSource = value; RaisePropertyChanged(nameof(SensorsViewSource)); + } + + } + + private ObservableCollection _syncconfigurations; + /// + /// Gets or sets the SyncConfigurations. + /// + public ObservableCollection SyncConfigurations + { + get + { + return _syncconfigurations; + } + + set + { + _syncconfigurations = value; RaisePropertyChanged(nameof(SyncConfigurations)); + } + + } + + private ICollectionView _syncconfigurationsViewSource; + /// + /// Gets or sets the SyncConfigurations View Source. + /// + public ICollectionView SyncConfigurationsViewSource + { + get + { + return _syncconfigurationsViewSource; + } + + set + { + _syncconfigurationsViewSource = value; RaisePropertyChanged(nameof(SyncConfigurationsViewSource)); + } + + } + + private ObservableCollection _users; + /// + /// Gets or sets the Users. + /// + public ObservableCollection Users + { + get + { + return _users; + } + + set + { + _users = value; RaisePropertyChanged(nameof(Users)); + } + + } + + private ICollectionView _usersViewSource; + /// + /// Gets or sets the Users View Source. + /// + public ICollectionView UsersViewSource + { + get + { + return _usersViewSource; + } + + set + { + _usersViewSource = value; RaisePropertyChanged(nameof(UsersViewSource)); + } + + } + + private ObservableCollection _usersroles; + /// + /// Gets or sets the UsersRoles. + /// + public ObservableCollection UsersRoles + { + get + { + return _usersroles; + } + + set + { + _usersroles = value; RaisePropertyChanged(nameof(UsersRoles)); + } + + } + + private ICollectionView _usersrolesViewSource; + /// + /// Gets or sets the UsersRoles View Source. + /// + public ICollectionView UsersRolesViewSource + { + get + { + return _usersrolesViewSource; + } + + set + { + _usersrolesViewSource = value; RaisePropertyChanged(nameof(UsersRolesViewSource)); + } + + } + + private ObservableCollection _windingmethods; + /// + /// Gets or sets the WindingMethods. + /// + public ObservableCollection WindingMethods + { + get + { + return _windingmethods; + } + + set + { + _windingmethods = value; RaisePropertyChanged(nameof(WindingMethods)); + } + + } + + private ICollectionView _windingmethodsViewSource; + /// + /// Gets or sets the WindingMethods View Source. + /// + public ICollectionView WindingMethodsViewSource + { + get + { + return _windingmethodsViewSource; + } + + set + { + _windingmethodsViewSource = value; RaisePropertyChanged(nameof(WindingMethodsViewSource)); + } + + } + + /// + /// Initialize collection sources. + /// + private void InitCollectionSources() + { + + ActionTypesViewSource = CreateCollectionView(ActionTypes); + + AddressesViewSource = CreateCollectionView(Addresses); + + ApplicationDisplayPanelVersionsViewSource = CreateCollectionView(ApplicationDisplayPanelVersions); + + ApplicationFirmwareVersionsViewSource = CreateCollectionView(ApplicationFirmwareVersions); + + ApplicationOsVersionsViewSource = CreateCollectionView(ApplicationOsVersions); + + ApplicationVersionsViewSource = CreateCollectionView(ApplicationVersions); + + BrushStopsViewSource = CreateCollectionView(BrushStops); + + CartridgeTypesViewSource = CreateCollectionView(CartridgeTypes); + + CatsViewSource = CreateCollectionView(Cats); + + CctsViewSource = CreateCollectionView(Ccts); + + ColorSpacesViewSource = CreateCollectionView(ColorSpaces); + + ConfigurationsViewSource = CreateCollectionView(Configurations); + + ContactsViewSource = CreateCollectionView(Contacts); + + DispenserTypesViewSource = CreateCollectionView(DispenserTypes); + + EmbeddedFirmwareVersionsViewSource = CreateCollectionView(EmbeddedFirmwareVersions); + + EmbeddedSoftwareVersionsViewSource = CreateCollectionView(EmbeddedSoftwareVersions); + + EventTypesViewSource = CreateCollectionView(EventTypes); + + EventTypesActionsViewSource = CreateCollectionView(EventTypesActions); + + FiberShapesViewSource = CreateCollectionView(FiberShapes); + + FiberSynthsViewSource = CreateCollectionView(FiberSynths); + + HardwareVersionsViewSource = CreateCollectionView(HardwareVersions); + + IdsPackFormulasViewSource = CreateCollectionView(IdsPackFormulas); + + IdsPacksViewSource = CreateCollectionView(IdsPacks); + + JobRunsViewSource = CreateCollectionView(JobRuns); + + JobsViewSource = CreateCollectionView(Jobs); + + LinearMassDensityUnitsViewSource = CreateCollectionView(LinearMassDensityUnits); + + LiquidTypesViewSource = CreateCollectionView(LiquidTypes); + + LiquidTypesRmlsViewSource = CreateCollectionView(LiquidTypesRmls); + + MachineVersionsViewSource = CreateCollectionView(MachineVersions); + + MachinesViewSource = CreateCollectionView(Machines); + + MachinesConfigurationsViewSource = CreateCollectionView(MachinesConfigurations); + + MachinesEventsViewSource = CreateCollectionView(MachinesEvents); + + MediaColorsViewSource = CreateCollectionView(MediaColors); + + MediaConditionsViewSource = CreateCollectionView(MediaConditions); + + MediaMaterialsViewSource = CreateCollectionView(MediaMaterials); + + MediaPurposesViewSource = CreateCollectionView(MediaPurposes); + + MidTankTypesViewSource = CreateCollectionView(MidTankTypes); + + OrganizationsViewSource = CreateCollectionView(Organizations); + + PermissionsViewSource = CreateCollectionView(Permissions); + + ProcessParametersTablesViewSource = CreateCollectionView(ProcessParametersTables); + + ProcessParametersTablesGroupsViewSource = CreateCollectionView(ProcessParametersTablesGroups); + + RmlsViewSource = CreateCollectionView(Rmls); + + RolesViewSource = CreateCollectionView(Roles); + + RolesPermissionsViewSource = CreateCollectionView(RolesPermissions); + + SegmentsViewSource = CreateCollectionView(Segments); + + SensorsViewSource = CreateCollectionView(Sensors); + + SyncConfigurationsViewSource = CreateCollectionView(SyncConfigurations); + + UsersViewSource = CreateCollectionView(Users); + + UsersRolesViewSource = CreateCollectionView(UsersRoles); + + WindingMethodsViewSource = CreateCollectionView(WindingMethods); + + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Partials/Configuration.cs b/Software/Visual_Studio/Tango.Integration/Observables/Partials/Configuration.cs new file mode 100644 index 000000000..c60102671 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Partials/Configuration.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.Integration.Observables +{ + public partial class Configuration + { + public override void DefferedDelete() + { + IdsPacks.ToList().ForEach(x => x.DefferedDelete()); + var machine_configurations = ObservablesEntitiesAdapter.Instance.MachinesConfigurations.Where(x => x.Configuration == this); + MachinesConfigurations.ToList().ForEach(x => x.DefferedDelete()); + base.DefferedDelete(); + IdsPacks.Clear(); + } + + public override void Delete() + { + IdsPacks.ToList().ForEach(x => x.DefferedDelete()); + var machine_configurations = ObservablesEntitiesAdapter.Instance.MachinesConfigurations.Where(x => x.Configuration == this); + MachinesConfigurations.ToList().ForEach(x => x.DefferedDelete()); + base.Delete(); + IdsPacks.Clear(); + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Partials/Machine.cs b/Software/Visual_Studio/Tango.Integration/Observables/Partials/Machine.cs new file mode 100644 index 000000000..0121bccef --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Partials/Machine.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.Integration.Observables +{ + public partial class Machine + { + /// + /// Deletes this entity from the database + /// + public override void Delete() + { + foreach (var machine_config in MachinesConfigurations) + { + machine_config.Delete(); + machine_config.Configuration.Delete(); + } + + base.Delete(); + + ObservablesEntitiesAdapter.Instance.SaveChanges(); + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Partials/MachineVersion.cs b/Software/Visual_Studio/Tango.Integration/Observables/Partials/MachineVersion.cs new file mode 100644 index 000000000..c7d1f8321 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Partials/MachineVersion.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.Integration.Observables +{ + public partial class MachineVersion + { + public override void Delete() + { + this.DefaultConfiguration.Delete(); + base.Delete(); + + ObservablesEntitiesAdapter.Instance.SaveChanges(); + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Partials/Segment.cs b/Software/Visual_Studio/Tango.Integration/Observables/Partials/Segment.cs new file mode 100644 index 000000000..c83c34870 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Partials/Segment.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.Collections.Specialized; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.Integration.Observables +{ + public partial class Segment + { + public override void Save() + { + for (int i = 0; i < BrushStops.Count; i++) + { + BrushStops[i].StopIndex = i; + } + + base.Save(); + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Partials/User.cs b/Software/Visual_Studio/Tango.Integration/Observables/Partials/User.cs new file mode 100644 index 000000000..b70aae8a4 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Observables/Partials/User.cs @@ -0,0 +1,39 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.Integration.Observables +{ + public partial class User + { + /// + /// Determines whether the user has the specified permission. + /// + /// The permission. + /// + /// true if the user has permission; otherwise, false. + /// + public bool HasPermission(Permissions permission) + { + return UsersRoles.Select(x => x.Role).ToList().SelectMany(x => x.RolesPermissions).ToList().Exists(x => x.Permission.Code == permission.ToInt32()); + } + + /// + /// Gets the aggregated user roles as enumerations. + /// + public List Roles + { + get { return UsersRoles.Select(x => (Roles)x.Role.Code).ToList(); } + } + + /// + /// Gets the aggregated user permissions as enumerations. + /// + public List Permissions + { + get { return UsersRoles.Select(x => x.Role).ToList().SelectMany(x => x.RolesPermissions).Select(x => (Permissions)x.Permission.Code).ToList(); } + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Printing/BrushStop.cs b/Software/Visual_Studio/Tango.Integration/Printing/BrushStop.cs new file mode 100644 index 000000000..97126bc82 --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Printing/BrushStop.cs @@ -0,0 +1,105 @@ +using ColorMine.ColorSpaces; +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Media; +using Tango.Core; +using Tango.Integration.Printing; + +namespace Tango.Integration.Observables +{ + public partial class BrushStop + { + private ObservableCollection _liquidVolumes; + [NotMapped] + public ObservableCollection LiquidVolumes + { + get { return _liquidVolumes; } + set { _liquidVolumes = value; RaisePropertyChangedAuto(); } + } + + private Color _color; + [NotMapped] + public Color Color + { + get { return _color; } + set + { + _color = value; + _red = _color.R; + _green = _color.G; + _blue = _color.B; + RaisePropertyChanged(nameof(Color)); + } + } + + public void SetLiquidVolumes(Configuration configuration, Rml rml) + { + LiquidVolumes = new ObservableCollection(); + + foreach (var idsPack in configuration.IdsPacks) + { + LiquidVolumes.Add(new LiquidVolume(configuration, idsPack, rml, this)); + } + } + + private bool _ignorePropChanged; + + protected override void RaisePropertyChanged(string propName) + { + base.RaisePropertyChanged(propName); + + if (!_ignorePropChanged && propName != nameof(ColorSpace) && ColorSpace != null) + { + Rgb rgb = new Rgb(Red, Green, Blue); + Cmyk cmyk = new Cmyk(Cyan, Magenta, Yellow, Black); + Lab lab = new Lab(L, A, B); + + switch ((ColorSpaces)ColorSpace.Code) + { + case ColorSpaces.RGB: + cmyk = rgb.To(); + lab = rgb.To(); + break; + case ColorSpaces.CMYK: + rgb = cmyk.To(); + lab = cmyk.To(); + break; + case ColorSpaces.LAB: + rgb = lab.To(); + cmyk = lab.To(); + break; + } + + _red = (int)rgb.R; + _green = (int)rgb.G; + _blue = (int)rgb.B; + + _cyan = cmyk.C * 100d; + _magenta = cmyk.M * 100d; + _yellow = cmyk.Y * 100d; + _black = cmyk.K * 100d; + + _l = lab.L; + _a = lab.A; + _b = lab.B; + + _color = Color.FromRgb((byte)_red, (byte)_green, (byte)_blue); + + _ignorePropChanged = true; + + foreach (var prop in typeof(BrushStop).GetProperties(BindingFlags.Instance | BindingFlags.Public)) + { + RaisePropertyChanged(prop.Name); + } + + _ignorePropChanged = false; + } + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Printing/LiquidVolume.cs b/Software/Visual_Studio/Tango.Integration/Printing/LiquidVolume.cs new file mode 100644 index 000000000..0821d15fe --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Printing/LiquidVolume.cs @@ -0,0 +1,123 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.Core; +using Tango.Integration.Formulation; +using Tango.Integration.Observables; + +namespace Tango.Integration.Printing +{ + public class LiquidVolume : ExtendedObject + { + private BrushStop _brushStop; + public BrushStop BrushStop + { + get { return _brushStop; } + set { _brushStop = value; RaisePropertyChangedAuto(); } + } + + private Configuration _configuration; + + public Configuration Configuration + { + get { return _configuration; } + set { _configuration = value; RaisePropertyChangedAuto(); } + } + + private IdsPack _idsPack; + public IdsPack IdsPack + { + get { return _idsPack; } + set { _idsPack = value; RaisePropertyChangedAuto(); } + } + + private Rml _rml; + public Rml RML + { + get { return _rml; } + set { _rml = value; RaisePropertyChangedAuto(); } + } + + private double _volume; + public double Volume + { + get { return _volume; } + set + { + _volume = value; + RaisePropertyChangedAuto(); + OnVolumeChanged(); + } + } + + public void Invalidate() + { + InvalidateSolo(); + + foreach (var liquidVolume in BrushStop.LiquidVolumes.Where(x => x != this)) + { + liquidVolume.InvalidateSolo(); + } + } + + private void InvalidateSolo() + { + _volume = FormulasCalculationService.CoerceVolume(this); + + typeof(BrushStop).GetProperty("V" + Configuration.IdsPacks.IndexOf(IdsPack)).SetValue(BrushStop, Volume); + RaisePropertyChanged(nameof(LiquidMaxNanoliterPerCentimeter)); + RaisePropertyChanged(nameof(NanoliterPerSecond)); + RaisePropertyChanged(nameof(PulsePerSecond)); + RaisePropertyChanged(nameof(Volume)); + } + + public LiquidVolume(Configuration configuration, IdsPack idsPack, Rml rml, BrushStop brushStop) + { + BrushStop = brushStop; + IdsPack = idsPack; + Configuration = configuration; + RML = rml; + + Volume = (double)typeof(BrushStop).GetProperty("V" + Configuration.IdsPacks.IndexOf(IdsPack)).GetValue(BrushStop); + } + + private void OnVolumeChanged() + { + Invalidate(); + } + + public double LiquidMaxNanoliterPerCentimeter + { + get + { + if (Configuration != null && RML != null) + { + List factors = Configuration.IdsPacks.OrderBy(x => x.PackIndex).Select(x => x.LiquidType).SelectMany(x => x.LiquidTypesRmls).Where(x => x.Rml.Guid == RML.Guid).ToList(); + return factors[BrushStop.LiquidVolumes.IndexOf(this)].MaxNlPerCm; + } + else + { + return 0d; + } + } + } + + public double NanoliterPerSecond + { + get + { + return FormulasCalculationService.CalculateNanoliterPerSecond(this); + } + } + + public double PulsePerSecond + { + get + { + return FormulasCalculationService.CalculatePulsePerSecond(this); + } + } + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Printing/Profile.cs b/Software/Visual_Studio/Tango.Integration/Printing/Profile.cs deleted file mode 100644 index 9eccfcdcc..000000000 --- a/Software/Visual_Studio/Tango.Integration/Printing/Profile.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.Core; - -namespace Tango.Integration.Printing -{ - public class Profile : ExtendedObject - { - private String _name; - - public String Name - { - get { return _name; } - set { _name = value; RaisePropertyChangedAuto(); } - } - - - } -} diff --git a/Software/Visual_Studio/Tango.Integration/Printing/Segment.cs b/Software/Visual_Studio/Tango.Integration/Printing/Segment.cs deleted file mode 100644 index 0854485e5..000000000 --- a/Software/Visual_Studio/Tango.Integration/Printing/Segment.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.Core; - -namespace Tango.Integration.Printing -{ - public class Segment : ExtendedObject - { - - } -} diff --git a/Software/Visual_Studio/Tango.Integration/Services/ExternalBridgeTcpClient.cs b/Software/Visual_Studio/Tango.Integration/Services/ExternalBridgeTcpClient.cs index 5dfa5c3b3..e54bf1bd5 100644 --- a/Software/Visual_Studio/Tango.Integration/Services/ExternalBridgeTcpClient.cs +++ b/Software/Visual_Studio/Tango.Integration/Services/ExternalBridgeTcpClient.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.Integration.Operators; using Tango.PMR.Integration; using Tango.Settings; diff --git a/Software/Visual_Studio/Tango.Integration/Services/ExternalBridgeUsbClient.cs b/Software/Visual_Studio/Tango.Integration/Services/ExternalBridgeUsbClient.cs index 733e9c6a4..e6124d0a8 100644 --- a/Software/Visual_Studio/Tango.Integration/Services/ExternalBridgeUsbClient.cs +++ b/Software/Visual_Studio/Tango.Integration/Services/ExternalBridgeUsbClient.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.Integration.Operators; using Tango.PMR.Integration; using Tango.Settings; diff --git a/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj b/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj index 4257dd53e..4290ae895 100644 --- a/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj +++ b/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj @@ -30,10 +30,19 @@ 4 + + ..\packages\EntityFramework.6.0.0\lib\net45\EntityFramework.dll + + + ..\packages\EntityFramework.6.0.0\lib\net45\EntityFramework.SqlServer.dll + ..\packages\Google.Protobuf.3.4.1\lib\net45\Google.Protobuf.dll + + + @@ -65,10 +74,98 @@ GlobalVersionInfo.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + @@ -78,13 +175,17 @@ + + {37e4ceab-b54b-451f-b535-04cf7da9c459} + ColorMine + {a34ee0f0-649d-41c8-8489-b6f1cc6924ee} Tango.Core - - {0ecd6da8-7aa6-48d9-8b65-279d176ad9af} - Tango.DAL.Observables + + {38197109-8610-4d3f-92b9-16d48df94d7c} + Tango.DAL.Remote {bc932dbd-7cdb-488c-99e4-f02cf441f55e} @@ -107,5 +208,6 @@ + \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Integration/app.config b/Software/Visual_Studio/Tango.Integration/app.config index cacd4cd77..4a6cb0526 100644 --- a/Software/Visual_Studio/Tango.Integration/app.config +++ b/Software/Visual_Studio/Tango.Integration/app.config @@ -1,5 +1,9 @@  + + +
+ @@ -8,4 +12,10 @@ + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Integration/packages.config b/Software/Visual_Studio/Tango.Integration/packages.config index c8a2e03ee..7abb06657 100644 --- a/Software/Visual_Studio/Tango.Integration/packages.config +++ b/Software/Visual_Studio/Tango.Integration/packages.config @@ -1,5 +1,6 @@  + diff --git a/Software/Visual_Studio/Tango.UnitTesting/CodeGeneration_TST.cs b/Software/Visual_Studio/Tango.UnitTesting/CodeGeneration_TST.cs index 3435021eb..373d88722 100644 --- a/Software/Visual_Studio/Tango.UnitTesting/CodeGeneration_TST.cs +++ b/Software/Visual_Studio/Tango.UnitTesting/CodeGeneration_TST.cs @@ -1,7 +1,7 @@ using System; using Microsoft.VisualStudio.TestTools.UnitTesting; using Tango.DAL.Remote.DB; -using Tango.DAL.Observables; +using Tango.Integration.Observables; using Tango.Settings; using System.Linq; using System.Collections.Generic; diff --git a/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj b/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj index 0130e3811..07bdafca7 100644 --- a/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj +++ b/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj @@ -102,14 +102,14 @@ {0e0eef3e-8f4e-4f23-9d19-479fd8d76c12} Tango.DAL.Local - - {0ecd6da8-7aa6-48d9-8b65-279d176ad9af} - Tango.DAL.Observables - {38197109-8610-4d3f-92b9-16d48df94d7c} Tango.DAL.Remote + + {4206ac58-3b57-4699-8835-90bf6db01a61} + Tango.Integration + {bc932dbd-7cdb-488c-99e4-f02cf441f55e} Tango.Logging diff --git a/Software/Visual_Studio/Tango.sln b/Software/Visual_Studio/Tango.sln index 3129ace25..cb53eaffc 100644 --- a/Software/Visual_Studio/Tango.sln +++ b/Software/Visual_Studio/Tango.sln @@ -77,8 +77,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.Scripting", "Tango.Sc EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.SharedUI", "Tango.SharedUI\Tango.SharedUI.csproj", "{8491D07B-C1F6-4B62-A412-41B9FD2D6538}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.DAL.Observables", "Tango.DAL.Observables\Tango.DAL.Observables.csproj", "{0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.DBObservablesGenerator.CLI", "Utilities\Tango.DBObservablesGenerator.CLI\Tango.DBObservablesGenerator.CLI.csproj", "{EBB7CB9F-6AF2-456B-A5DD-1B136B605D90}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MachineStudio", "MachineStudio", "{57DF2A95-5DDD-4830-A4AF-B484B59C7C2B}" @@ -976,35 +974,6 @@ Global {8491D07B-C1F6-4B62-A412-41B9FD2D6538}.Release|x64.Build.0 = Release|Any CPU {8491D07B-C1F6-4B62-A412-41B9FD2D6538}.Release|x86.ActiveCfg = Release|Any CPU {8491D07B-C1F6-4B62-A412-41B9FD2D6538}.Release|x86.Build.0 = Release|Any CPU - {0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.Debug|ARM.ActiveCfg = Debug|Any CPU - {0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.Debug|ARM.Build.0 = Debug|Any CPU - {0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.Debug|ARM64.Build.0 = Debug|Any CPU - {0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.Debug|x64.ActiveCfg = Debug|Any CPU - {0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.Debug|x64.Build.0 = Debug|Any CPU - {0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.Debug|x86.ActiveCfg = Debug|Any CPU - {0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.DefaultBuild|Any CPU.ActiveCfg = Debug|Any CPU - {0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.DefaultBuild|Any CPU.Build.0 = Debug|Any CPU - {0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.DefaultBuild|ARM.ActiveCfg = Debug|Any CPU - {0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.DefaultBuild|ARM.Build.0 = Debug|Any CPU - {0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.DefaultBuild|ARM64.ActiveCfg = Debug|Any CPU - {0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.DefaultBuild|ARM64.Build.0 = Debug|Any CPU - {0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.DefaultBuild|x64.ActiveCfg = Debug|Any CPU - {0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.DefaultBuild|x64.Build.0 = Debug|Any CPU - {0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.DefaultBuild|x86.ActiveCfg = Debug|Any CPU - {0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.DefaultBuild|x86.Build.0 = Debug|Any CPU - {0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.Release|Any CPU.Build.0 = Release|Any CPU - {0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.Release|ARM.ActiveCfg = Release|Any CPU - {0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.Release|ARM.Build.0 = Release|Any CPU - {0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.Release|ARM64.ActiveCfg = Release|Any CPU - {0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.Release|ARM64.Build.0 = Release|Any CPU - {0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.Release|x64.ActiveCfg = Release|Any CPU - {0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.Release|x64.Build.0 = Release|Any CPU - {0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.Release|x86.ActiveCfg = Release|Any CPU - {0ECD6DA8-7AA6-48D9-8B65-279D176AD9AF}.Release|x86.Build.0 = Release|Any CPU {EBB7CB9F-6AF2-456B-A5DD-1B136B605D90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EBB7CB9F-6AF2-456B-A5DD-1B136B605D90}.Debug|Any CPU.Build.0 = Debug|Any CPU {EBB7CB9F-6AF2-456B-A5DD-1B136B605D90}.Debug|ARM.ActiveCfg = Debug|Any CPU -- cgit v1.3.1