merge conflict

1 files changed, 12 insertions, 1 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 6cc8289f4..918eb02d4 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
@@ -13,6 +13,7 @@ using Tango.SharedUI.Components;
 using System.Runtime.CompilerServices;
 using Tango.MachineStudio.Common;
 using Tango.Core.ExtensionMethods;
+using Tango.MachineStudio.HardwareDesigner.Views;
 
 namespace Tango.MachineStudio.HardwareDesigner.ViewModels
 {
@@ -86,7 +87,7 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
                 return name;
             }
         }
-
+       
         private ObservableCollection<HardwareVersion> _hardwareVersions;
         public ObservableCollection<HardwareVersion> HardwareVersions
         {
@@ -104,6 +105,8 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
 
         public RelayCommand CopyParametersCommand { get; set; }
 
+        public RelayCommand OpenComparisonWizardCommand { get; set; }
+
         public MainViewVM(INotificationProvider notification)
         {
             _notification = notification;
@@ -118,6 +121,8 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
 
             CopyParametersCommand = new RelayCommand(CopyParameters, (x) => SelectedVersion != null && IsFree);
             CloneCommand = new RelayCommand(CloneCurrentVersion, () => SelectedVersion != null && IsFree);
+
+            OpenComparisonWizardCommand = new RelayCommand(OpenComparisonWizard);
         }
 
         public override void OnApplicationReady()
@@ -428,6 +433,12 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
             }
         }
 
+        private void OpenComparisonWizard()
+        {
+            ComparisonWizardViewVM vm = new ComparisonWizardViewVM(HardwareVersions, SelectedVersion, _notification);
+            _notification.ShowModalDialog<ComparisonWizardViewVM, ComparisonWizardView>(vm, (x) => { }, () => { });
+        }
+
         protected override void RaisePropertyChangedAuto([CallerMemberName] string caller = null)
         {
             base.RaisePropertyChangedAuto(caller);