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

2 files changed, 29 insertions, 18 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs
index cf66c1a34..47fe19a05 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/MainViewVM.cs
@@ -261,7 +261,7 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
         {
             using (var db = ObservablesContext.CreateDefault())
             {
-                _hardwareVersions = db.HardwareVersions.ToObservableCollection();
+                _hardwareVersions = db.HardwareVersions.OrderByDescending(x => x.Version).ToObservableCollection();
                 InvokeUI(() =>
                 {
                     RaisePropertyChanged(nameof(HardwareVersions));
@@ -360,24 +360,34 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
             {
                 using (_notification.PushTaskItem("Loading hardware version..."))
                 {
-                    IsFree = false;
-
-                    await Task.Factory.StartNew(() =>
+                    try
                     {
-                        _isNew = false;
-                        var selectedVersion = SelectedVersion;
-                        RefreshVersions();
-                        var version = _hardwareVersions.SingleOrDefault(X => X.Guid == selectedVersion.Guid);
-                        CreateVersionView(SelectedVersion);
+                        IsFree = false;
 
-                        InvokeUI(() =>
+                        await Task.Factory.StartNew(() =>
                         {
-                            _selectedVersion = version;
-                            RaisePropertyChanged(nameof(SelectedVersion));
-                        });
-                    });
+                            _isNew = false;
+                            var selectedVersion = SelectedVersion;
+                            RefreshVersions();
+                            var version = _hardwareVersions.SingleOrDefault(X => X.Guid == selectedVersion.Guid);
+                            CreateVersionView(SelectedVersion);
 
-                    IsFree = true;
+                            InvokeUI(() =>
+                            {
+                                _selectedVersion = version;
+                                RaisePropertyChanged(nameof(SelectedVersion));
+                            });
+                        });
+                    }
+                    catch (Exception ex)
+                    {
+                        LogManager.Log(ex, "Error loading hardware version.");
+                        _notification.ShowError($"Error loading the selected hardware version.\n{ex.FlattenMessage()}");
+                    }
+                    finally
+                    {
+                        IsFree = true;
+                    }
                 }
             }
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views/MainView.xaml
index 1c00397aa..9ee2ffee7 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views/MainView.xaml
@@ -9,6 +9,7 @@
              xmlns:editors="clr-namespace:Tango.SharedUI.Editors;assembly=Tango.SharedUI"
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:entities="clr-namespace:Tango.BL.Entities;assembly=Tango.BL"
+             xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
              xmlns:local="clr-namespace:Tango.MachineStudio.HardwareDesigner.Views"
              xmlns:vm="clr-namespace:Tango.MachineStudio.HardwareDesigner.ViewModels"
              xmlns:observables="clr-namespace:Tango.BL.Entities;assembly=Tango.BL"
@@ -57,14 +58,14 @@
                                 <TextBlock FontSize="30" FontStyle="Italic" VerticalAlignment="Center" Margin="50 10 10 0" Foreground="Silver" FontWeight="Bold">HARDWARE DESIGNER</TextBlock>
                                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="10 10 0 0">
                                     <materialDesign:PackIcon Kind="Pencil" Width="32" Height="32" Foreground="Silver" />
-                                    <ComboBox IsEnabled="{Binding IsFree}" ItemsSource="{Binding HardwareVersions}" SelectedItem="{Binding SelectedVersion}" Width="300" FontSize="16" FontWeight="Bold" Margin="5 0 0 0" materialDesign:HintAssist.Hint="Hardware Version">
+                                    <controls:SearchComboBox IsEnabled="{Binding IsFree}" ItemsSource="{Binding HardwareVersions}" SelectedItem="{Binding SelectedVersion}"  Width="300" SearchProperty="FullName" FontSize="16" FontWeight="Bold" Margin="5 0 0 0" materialDesign:HintAssist.Hint="Hardware Version">
                                         <ComboBox.ItemTemplate>
                                             <DataTemplate>
                                                 <TextBlock><Run Text="{Binding Name}"></Run> <Run></Run> <Run Foreground="{StaticResource MainWindow.Foreground}" FontSize="14">v</Run><Run Foreground="{StaticResource MainWindow.Foreground}" FontSize="14" Text="{Binding Version}"></Run></TextBlock>
                                             </DataTemplate>
                                         </ComboBox.ItemTemplate>
-                                    </ComboBox>
-                                    
+                                    </controls:SearchComboBox>
+
                                 </StackPanel>
                                 <Button Margin="100 10 0 0" Cursor="Hand" Height="40" FontSize="12" ToolTip="Open Comparison Wizard" Command="{Binding OpenComparisonWizardCommand}">
                                     <StackPanel Orientation="Horizontal">