From d33c19b3ac6803de4b5c8d475832efef131c1a45 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy@twine-s.com>
Date: Wed, 30 Dec 2020 15:11:34 +0000
Subject: Revert "Hope it is fine"

---
 .../ViewModels/HardwareConfigurationViewVM.cs      | 32 ++++++++++++++--------
 1 file changed, 21 insertions(+), 11 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/HardwareConfigurationViewVM.cs')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/HardwareConfigurationViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/HardwareConfigurationViewVM.cs
index f7ae88f68..e29ba3b6f 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/HardwareConfigurationViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/HardwareConfigurationViewVM.cs
@@ -92,16 +92,19 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         {
             HardwareVersion hardwareVersion = configuration.HardwareVersion;
 
-            _hwConfig = configuration.GetHardwareConfiguration();
-
-            Collections.Clear();
-            Collections.Add(CreateMotorsCollection(hardwareVersion));
-            Collections.Add(CreateDancerCollection(hardwareVersion));
-            Collections.Add(CreatePidCollection(hardwareVersion));
-            Collections.Add(CreateWindersCollection(hardwareVersion));
-            Collections.Add(CreateSpeedSensorsCollection(hardwareVersion));
-            Collections.Add(CreateBlowersCollection(hardwareVersion));
-            Collections.Add(CreateBreakSensorCollection(hardwareVersion));
+            if (hardwareVersion != null)
+            {
+                _hwConfig = configuration.GetHardwareConfiguration();
+
+                Collections.Clear();
+                Collections.Add(CreateMotorsCollection(hardwareVersion));
+                Collections.Add(CreateDancerCollection(hardwareVersion));
+                Collections.Add(CreatePidCollection(hardwareVersion));
+                Collections.Add(CreateWindersCollection(hardwareVersion));
+                Collections.Add(CreateSpeedSensorsCollection(hardwareVersion));
+                Collections.Add(CreateBlowersCollection(hardwareVersion));
+                Collections.Add(CreateBreakSensorCollection(hardwareVersion));
+            }
         }
 
         private HardwareCollection CreateMotorsCollection(HardwareVersion hardwareVersion)
@@ -124,6 +127,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     collection.Components.Add(componentResult);
                 }
             }
+            collection.Components = collection.Components.OrderByAlphaNumeric(x => x.Description).ToSynchronizedObservableCollection();
             return collection;
         }
         private HardwareCollection CreateDancerCollection(HardwareVersion hardwareVersion)
@@ -146,6 +150,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     collection.Components.Add(componentResult);
                 }
             }
+            collection.Components = collection.Components.OrderByAlphaNumeric(x => x.Description).ToSynchronizedObservableCollection();
             return collection;
         }
         private HardwareCollection CreatePidCollection(HardwareVersion hardwareVersion)
@@ -168,6 +173,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     collection.Components.Add(componentResult);
                 }
             }
+            collection.Components = collection.Components.OrderByAlphaNumeric(x => x.Description).ToSynchronizedObservableCollection();
             return collection;
         }
         private HardwareCollection CreateWindersCollection(HardwareVersion hardwareVersion)
@@ -190,6 +196,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     collection.Components.Add(componentResult);
                 }
             }
+            collection.Components = collection.Components.OrderByAlphaNumeric(x => x.Description).ToSynchronizedObservableCollection();
             return collection;
         }
         private HardwareCollection CreateSpeedSensorsCollection(HardwareVersion hardwareVersion)
@@ -212,6 +219,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     collection.Components.Add(componentResult);
                 }
             }
+            collection.Components = collection.Components.OrderByAlphaNumeric(x => x.Description).ToSynchronizedObservableCollection();
             return collection;
         }
         private HardwareCollection CreateBlowersCollection(HardwareVersion hardwareVersion)
@@ -234,6 +242,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     collection.Components.Add(componentResult);
                 }
             }
+            collection.Components= collection.Components.OrderByAlphaNumeric(x => x.Description).ToSynchronizedObservableCollection();
             return collection;
         }
         private HardwareCollection CreateBreakSensorCollection(HardwareVersion hardwareVersion)
@@ -256,6 +265,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     collection.Components.Add(componentResult);
                 }
             }
+            collection.Components = collection.Components.OrderByAlphaNumeric(x => x.Description).ToSynchronizedObservableCollection();
             return collection;
         }
         private HardwareComponent CreateComponent(String name, String description, List<PropertyInfo> properties, Object component)
@@ -265,7 +275,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                 Description = description,
                 ComponentName = name
             };
-
+            
             foreach (var prop in properties)
             {
                 var hProp = new HardwareParameter();
-- 
cgit v1.3.1