From b2db361984b7f6833d24eb4c574ec3513d8b7633 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Thu, 9 Aug 2018 13:52:40 +0300 Subject: Removed APPLICATION_VERSIONS & EMBEDDED_SOFTWARE_VERSIONS TABLES. Added TANGO_VERSIONS. Working on PPC machine setup. --- .../ViewModels/MainViewVM.cs | 38 ++-------------------- 1 file changed, 3 insertions(+), 35 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs') 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 0bd8f8133..1f410d49c 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 @@ -205,12 +205,10 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels List collections = new List(); + collections.Add(Adapter.ApplicationFirmwareVersionsViewSource); collections.Add(Adapter.ApplicationDisplayPanelVersionsViewSource); - collections.Add(Adapter.ApplicationVersionsViewSource); - collections.Add(Adapter.EmbeddedSoftwareVersionsViewSource); - collections.Add(Adapter.EmbeddedFirmwareVersionsViewSource); collections.Add(Adapter.ApplicationOsVersionsViewSource); - collections.Add(Adapter.ApplicationVersionsViewSource); + collections.Add(Adapter.EmbeddedFirmwareVersionsViewSource); collections.Add(Adapter.DispenserTypesViewSource); collections.Add(Adapter.CartridgeTypesViewSource); collections.Add(Adapter.LiquidTypesViewSource); @@ -273,16 +271,6 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels Configuration.ApplicationFirmwareVersionGuid = applicationFirmwareVersion.Guid; } - /// - /// Drops the application version. - /// - /// The application version. - public void DropApplicationVersion(ApplicationVersion applicationVersion) - { - Configuration.ApplicationVersion = applicationVersion; - Configuration.ApplicationVersionGuid = applicationVersion.Guid; - } - /// /// Drops the hardware version. /// @@ -303,16 +291,6 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels Configuration.EmbeddedFirmwareVersionGuid = embeddedFirmwareVersion.Guid; } - /// - /// Drops the embedded software. - /// - /// The embedded software version. - public void DropEmbeddedSoftware(EmbeddedSoftwareVersion embeddedSoftwareVersion) - { - Configuration.EmbeddedSoftwareVersion = embeddedSoftwareVersion; - Configuration.EmbeddedSoftwareVersionGuid = embeddedSoftwareVersion.Guid; - } - /// /// Drops the application os version. /// @@ -320,7 +298,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels public void DropApplicationOsVersion(ApplicationOsVersion applicationOsVersion) { Configuration.ApplicationOsVersion = applicationOsVersion; - Configuration.ApplicationVersionGuid = applicationOsVersion.Guid; + Configuration.ApplicationOsVersionGuid = applicationOsVersion.Guid; } /// @@ -457,21 +435,11 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels errors.Add("Application operation system is required."); } - if (Configuration.ApplicationVersion == null) - { - errors.Add("Application version is required."); - } - if (Configuration.EmbeddedFirmwareVersion == null) { errors.Add("Embedded firmware is required."); } - if (Configuration.EmbeddedSoftwareVersion == null) - { - errors.Add("Embedded software is required."); - } - if (Configuration.HardwareVersion == null) { errors.Add("Hardware version is required."); -- cgit v1.3.1