Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 3 insertions, 35 deletions

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<ICollectionView> collections = new List<ICollectionView>();
+            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);
@@ -274,16 +272,6 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         }
 
         /// <summary>
-        /// Drops the application version.
-        /// </summary>
-        /// <param name="applicationVersion">The application version.</param>
-        public void DropApplicationVersion(ApplicationVersion applicationVersion)
-        {
-            Configuration.ApplicationVersion = applicationVersion;
-            Configuration.ApplicationVersionGuid = applicationVersion.Guid;
-        }
-
-        /// <summary>
         /// Drops the hardware version.
         /// </summary>
         /// <param name="hardwareVersion">The hardware version.</param>
@@ -304,23 +292,13 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         }
 
         /// <summary>
-        /// Drops the embedded software.
-        /// </summary>
-        /// <param name="embeddedSoftwareVersion">The embedded software version.</param>
-        public void DropEmbeddedSoftware(EmbeddedSoftwareVersion embeddedSoftwareVersion)
-        {
-            Configuration.EmbeddedSoftwareVersion = embeddedSoftwareVersion;
-            Configuration.EmbeddedSoftwareVersionGuid = embeddedSoftwareVersion.Guid;
-        }
-
-        /// <summary>
         /// Drops the application os version.
         /// </summary>
         /// <param name="applicationOsVersion">The application os version.</param>
         public void DropApplicationOsVersion(ApplicationOsVersion applicationOsVersion)
         {
             Configuration.ApplicationOsVersion = applicationOsVersion;
-            Configuration.ApplicationVersionGuid = applicationOsVersion.Guid;
+            Configuration.ApplicationOsVersionGuid = applicationOsVersion.Guid;
         }
 
         /// <summary>
@@ -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.");