From 7b1863f611263244e770e6c02fe167b6e91c3182 Mon Sep 17 00:00:00 2001
From: joekolodz <kolodz@gmail.com>
Date: Wed, 6 Apr 2022 11:10:57 -0500
Subject: [PATCH] new method to allow device list to be passed in when
 overlaying maps; include ShiftModePage for json converter;

---
 docs/diagrams/src/puml-theme-sierrahotas.puml | 454 ++++++++++++++++++
 src/Controls/MacroTransport.xaml              |   2 +-
 src/CustomJsonConverter.cs                    |   1 +
 src/Models/HOTASDevice.cs                     |  22 +-
 src/Models/IHOTASDevice.cs                    |   1 +
 src/ViewModels/ActionCatalogViewModel.cs      |   6 +
 src/ViewModels/HOTASCollectionViewModel.cs    |  19 +-
 tests/HOTASCollectionViewModelTests.cs        |  44 +-
 8 files changed, 530 insertions(+), 19 deletions(-)
 create mode 100644 docs/diagrams/src/puml-theme-sierrahotas.puml

diff --git a/docs/diagrams/src/puml-theme-sierrahotas.puml b/docs/diagrams/src/puml-theme-sierrahotas.puml
new file mode 100644
index 0000000..f2953bb
--- /dev/null
+++ b/docs/diagrams/src/puml-theme-sierrahotas.puml
@@ -0,0 +1,454 @@
+''
+'' A gray and yellow theme based on the SierraHOTAS color scheme
+''
+'' Author: Joe Kolodz
+'' Copyright (c) 2022 by Joe kOlodz
+!$THEME = "sierrahotas"
+
+!if %not(%variable_exists("$BGCOLOR"))
+!$BGCOLOR = "transparent"
+!endif
+
+'color definitions - do not use these directly
+!$GOLD = "#ffd700"
+!$AZURE = "#f0ffff"
+!$RED = "#f00"
+!$GREEN = "#7cfc00"
+
+!$BRIGHT_BLUE = "#80e5ff"
+
+''text header
+!$LIGHT_BLUE = "#7ac1ff"
+''selected border
+!$MEDIUM_BLUE = "#26a0da"
+''hover
+!$DARK_BLUE = "#2a7aa1"
+''group border
+!$SLATEGRAY = "#708090"
+
+''alternate row
+!$MEDIUM_GRAY = "#424242"
+''window background
+!$DARK_GRAY = "#323232"
+
+''hover border
+!$LIGHT_BLUEGRAY = "#2a7aa1"
+''selected
+!$MEDIUM_BLUEGRAY = "#2f4c5a"
+''hover
+!$DARK_BLUEGRAY = "#313f47"
+
+'definitions for color usages, do not use # values here for colors. define them above first
+!$BACKGROUND = $DARK_GRAY
+!$TEXT_HEADER = $LIGHT_BLUE
+!$TEXT = $AZURE
+!$ERROR = $RED
+!$HEADER_BACKGROUND = $DARK_BLUEGRAY
+!$OBJECT_BACKGROUND = $MEDIUM_GRAY
+!$OBJECT_BORDER = $SLATEGRAY
+
+!procedure $success($msg)
+  <font color=$GREEN><b>$msg
+!endprocedure
+
+!procedure $failure($msg)
+  <font color=$RED><b>$msg
+!endprocedure
+
+!procedure $warning($msg)
+  <font color=$GOLD><b>$msg
+!endprocedure
+
+!procedure $primary_scheme()
+	FontColor $TEXT_HEADER
+	BorderColor $OBJECT_BORDER
+	BackgroundColor $OBJECT_BACKGROUND
+!endprocedure
+
+!procedure $secondary_scheme()
+	FontColor $TEXT_HEADER
+	BorderColor $OBJECT_BORDER
+	BackgroundColor $WHITE-#fefefe
+!endprocedure
+
+skinparam BackgroundColor       $BACKGROUND
+skinparam useBetaStyle          false
+skinparam defaultFontName       "Arial"
+skinparam defaultFontSize       14
+skinparam dpi                   100
+skinparam shadowing             false
+skinparam roundcorner           6
+skinparam ParticipantPadding    30
+skinparam BoxPadding            40
+skinparam Padding               1
+skinparam ArrowColor            $GOLD
+skinparam PackageBackgroundColor red
+
+skinparam stereotype {
+    'Class and Entity
+    CBackgroundColor $GREEN
+    CBorderColor $MEDIUM_GRAY
+    
+    'Abstract and Abstract Class
+    ABackgroundColor $MEDIUM_BLUE
+    ABorderColor $MEDIUM_GRAY
+    
+    'Interface
+    IBackgroundColor $GOLD
+    IBorderColor $MEDIUM_GRAY
+    
+    'Enum
+    EBackgroundColor $BRIGHT_BLUE
+    EBorderColor $MEDIUM_GRAY
+    
+    'Annotation
+    NBackgroundColor $BRIGHT_BLUE
+    NBorderColor $MEDIUM_GRAY
+}
+
+skinparam title {
+    $primary_scheme()
+    FontColor $GOLD
+}
+
+skinparam legend {
+	BackgroundColor $OBJECT_BACKGROUND
+	BorderColor $OBJECT_BORDER
+	FontColor $TEXT
+}
+
+!startsub swimlane
+skinparam swimlane {
+	BorderColor $INFO
+	BorderThickness 2
+	TitleBackgroundColor  $SECONDARY_LIGHT-$SECONDARY
+	TitleFontColor $PRIMARY
+}
+!endsub
+
+!startsub activity
+
+skinparam activity {
+	FontColor $PRIMARY_TEXT
+	BorderColor $PRIMARY
+	BackgroundColor $PRIMARY_LIGHT-$PRIMARY
+	BarColor $SUCCESS
+	StartColor $INFO
+	EndColor $INFO
+	DiamondBackgroundColor $HEADER_BACKGROUND
+  	DiamondBorderColor $OBJECT_BORDER
+	DiamondFontColor $TEXT
+}
+
+!endsub
+
+!startsub participant
+
+skinparam participant {
+	$primary_scheme()
+	ParticipantBorderThickness 2
+}
+!endsub
+
+!startsub actor
+
+skinparam actor {
+	$primary_scheme()
+	FontColor $PRIMARY
+}
+!endsub
+
+!startsub arrow
+
+skinparam arrow {
+	Thickness 1
+	Color $GOLD
+	FontColor $TEXT
+}
+
+!endsub
+
+!startsub sequence
+
+skinparam sequence {
+	BorderColor $PRIMARY
+	' For some reason sequence title font color does not pick up from global
+	TitleFontColor $PRIMARY
+	BackgroundColor $BGCOLOR
+	StartColor $PRIMARY
+	EndColor $PRIMARY
+	''
+	BoxBackgroundColor $BGCOLOR
+	BoxBorderColor $GRAY
+	BoxFontColor $DARK
+	''
+	DelayFontColor $DARK
+	''
+	LifeLineBorderColor $SECONDARY_DARK
+	LifeLineBorderThickness 2
+	LifeLineBackgroundColor $SECONDARY_LIGHT
+	''
+	GroupBorderColor $GRAY
+	GroupFontColor $DARK
+	GroupHeaderFontColor $INFO
+	GroupBackgroundColor $BGCOLOR
+	GroupBodyBackgroundColor $BGCOLOR
+	GroupHeaderBackgroundColor $BGCOLOR
+	''
+	DividerBackgroundColor $WHITE-$LIGHT
+    DividerBorderColor $GRAY
+    DividerBorderThickness 2
+    DividerFontColor $DARK
+	''
+	ReferenceBackgroundColor $BGCOLOR
+	ReferenceBorderColor $GRAY
+	ReferenceFontColor $DARK
+	ReferenceHeaderFontColor $INFO
+	''
+	StereotypeFontColor $PRIMARY_TEXT
+}
+!endsub
+
+!startsub partition
+
+skinparam partition {
+	BorderColor $PRIMARY
+	FontColor $PRIMARY
+	BackgroundColor $BGCOLOR
+}
+!endsub
+
+!startsub collections
+
+skinparam collections {
+	$primary_scheme()
+}
+!endsub
+
+!startsub control
+
+skinparam control {
+	$primary_scheme()
+	FontColor $PRIMARY
+}
+!endsub
+
+!startsub entity
+
+skinparam entity {
+	$primary_scheme()
+	FontColor $PRIMARY
+}
+!endsub
+
+!startsub boundary
+
+skinparam boundary {
+	$primary_scheme()
+	FontColor $PRIMARY
+}
+!endsub
+
+!startsub agent
+
+skinparam agent {
+	BackgroundColor #orange
+	BorderColor #999999
+	FontColor #333333
+}
+!endsub
+
+!startsub note
+
+skinparam note {
+	BorderThickness 1
+    BackgroundColor $GOLD
+	BorderColor $OBJECT_BORDER
+	FontColor $TEXT
+}
+
+!endsub
+
+!startsub artifact
+
+skinparam artifact {
+	BackgroundColor $PRIMARY-$PRIMARY_LIGHT
+	BorderColor $BORDER
+	FontColor $PRIMARY_TEXT
+}
+!endsub
+
+!startsub component
+
+skinparam component {
+	$primary_scheme()
+}
+!endsub
+
+!startsub interface
+
+skinparam interface {
+	BackgroundColor  $DANGER_LIGHT
+	BorderColor  $DANGER
+	FontColor $DARK
+}
+!endsub
+
+!startsub storage
+
+skinparam storage {
+	BackgroundColor $WARNING_LIGHT-$WARNING
+  	BorderColor $WARNING
+	FontColor $WARNING_TEXT
+}
+!endsub
+
+!startsub node
+
+skinparam node {
+	BackgroundColor $SECONDARY_LIGHT-$SECONDARY
+	BorderColor $SECONDARY_DARK
+	FontColor $PRIMARY
+}
+!endsub
+
+!startsub cloud
+
+skinparam cloud {
+	BackgroundColor transparent
+	BorderColor #F2FCFE
+	FontColor $PRIMARY
+}
+!endsub
+
+!startsub database
+
+skinparam database {
+	$primary_scheme()
+	' FontColor $PRIMARY
+	BorderColor $PRIMARY_DARK
+	' BackgroundColor  $BGCOLOR
+}
+!endsub
+
+!startsub class
+
+skinparam class{
+    $primary_scheme()
+
+    HeaderBackgroundColor $HEADER_BACKGROUND
+	StereotypeFontColor $PRIMARY_TEXT
+    FontSize 14
+    BorderThickness 1
+    AttributeFontColor $TEXT
+    AttributeFontSize 14
+}
+
+!endsub
+
+!startsub object
+
+skinparam object {
+	$primary_scheme()
+	StereotypeFontColor $PRIMARY_TEXT
+	BorderThickness 1
+	AttributeFontColor $PRIMARY_TEXT
+	AttributeFontSize 11
+}
+!endsub
+
+!startsub usecase
+
+skinparam usecase {
+	$primary_scheme()
+	BorderThickness 2
+	StereotypeFontColor $PRIMARY_TEXT
+}
+!endsub
+
+!startsub rectangle
+
+skinparam rectangle {
+	$secondary_scheme()
+	BorderThickness 2
+	StereotypeFontColor $PRIMARY_TEXT
+}
+!endsub
+
+!startsub package
+
+skinparam package {
+	FontColor $TEXT_HEADER
+	BorderColor $OBJECT_BORDER
+	BackgroundColor $OBJECT_BACKGROUND
+    StereotypeFontColor $TEXT
+    
+	BorderThickness 3
+}
+
+!endsub
+
+!startsub folder
+
+skinparam folder {
+	BackgroundColor $WHITE-$SECONDARY_LIGHT
+  	BorderColor $WARNING
+	FontColor $WARNING
+	BorderThickness 2
+}
+!endsub
+
+!startsub frame
+
+skinparam frame {
+	BackgroundColor $WHITE-$SECONDARY_LIGHT
+  	BorderColor $INFO
+	FontColor $INFO
+	BorderThickness 2
+}
+!endsub
+
+!startsub state
+
+skinparam state {
+	$primary_scheme()
+	BorderColor $PRIMARY_DARK
+	StartColor $INFO
+	EndColor $INFO
+	AttributeFontColor $PRIMARY_TEXT
+	AttributeFontSize 11
+}
+!endsub
+
+!startsub queue
+
+skinparam queue {
+	$primary_scheme()
+}
+!endsub
+
+!startsub card
+
+skinparam card {
+	BackgroundColor $INFO_LIGHT-$INFO
+	BorderColor $INFO
+	FontColor $INFO_TEXT
+}
+!endsub
+
+!startsub file
+
+skinparam file {
+	BackgroundColor $SECONDARY_LIGHT-$SECONDARY
+	BorderColor $INFO
+	FontColor $SECONDARY_TEXT
+
+}
+!endsub
+
+!startsub stack
+
+skinparam stack {
+	$primary_scheme()
+}
+!endsub
\ No newline at end of file
diff --git a/src/Controls/MacroTransport.xaml b/src/Controls/MacroTransport.xaml
index 2821d37..31e66ef 100644
--- a/src/Controls/MacroTransport.xaml
+++ b/src/Controls/MacroTransport.xaml
@@ -12,7 +12,7 @@
 
             <TextBox Text="{Binding ButtonName}" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" Foreground="{StaticResource TextBrush}" CaretBrush="{StaticResource TextBrush}" Margin="0,0,2,0" Width="200" Height="30" FontSize="14" Background="{StaticResource WindowBackgroundBrush}" BorderBrush="{StaticResource NormalBorderBrush}"/>
 
-            <Button Style="{StaticResource MacroButton}" Command="{Binding RecordMacroStartCommand, IsAsync=True}" Margin="0,0,1,0" ToolTip="Record a new keystroke activity" ToolTipService.InitialShowDelay="800" ToolTipService.ShowOnDisabled="True">
+            <Button Style="{StaticResource MacroButton}" Command="{Binding RecordMacroStartCommand, IsAsync=True}" Margin="0,0,1,0" ToolTip="Record a new keystroke or key-chord activity" ToolTipService.InitialShowDelay="800" ToolTipService.ShowOnDisabled="True">
                 <Image>
                     <Image.Style>
                         <Style TargetType="Image" BasedOn="{StaticResource MacroButtonImage}">
diff --git a/src/CustomJsonConverter.cs b/src/CustomJsonConverter.cs
index 6c3b92f..5a06889 100644
--- a/src/CustomJsonConverter.cs
+++ b/src/CustomJsonConverter.cs
@@ -126,6 +126,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
                 if (button.Type == HOTASButton.ButtonType.Button && string.CompareOrdinal(button.MapName, JoystickOffsetValues.GetName(button.MapId)) != 0 ||
                     button.Type == HOTASButton.ButtonType.POV && string.CompareOrdinal(button.MapName, JoystickOffsetValues.GetPOVName(button.MapId)) != 0 ||
                     button.ActionCatalogItem?.Actions?.Count > 0 ||
+                    button.ShiftModePage >0 ||
                     button.IsShift)
                 {
                     SerializeButton(writer, serializer, button);
diff --git a/src/Models/HOTASDevice.cs b/src/Models/HOTASDevice.cs
index 14f0215..b036d4f 100644
--- a/src/Models/HOTASDevice.cs
+++ b/src/Models/HOTASDevice.cs
@@ -268,7 +268,27 @@ public void OverlayAllProfilesToDevice()
             }
 
             ModeProfiles = mergedModeProfiles;
-            _hotasQueue.SetModeProfiles(ModeProfiles);
+            _hotasQueue?.SetModeProfiles(ModeProfiles);
+        }
+
+        /// <summary>
+        /// Existing buttons in the profile will overlay buttons on the device. If a device has a button with matching profile, then we'll keep that button (otherwise we'd lose it if we just took profile buttons)
+        /// This allows a device to change without losing mappings (for instance when chaining a new Virpil device, or manually editing and removing buttons from the profile's JSON file)
+        /// </summary>
+        public void OverlayAllProfilesToDevice(Dictionary<int, ObservableCollection<IHotasBaseMap>> profilesToMergeIn)
+        {
+            var mergedModeProfiles = new Dictionary<int, ObservableCollection<IHotasBaseMap>>();
+            var deviceButtons = new ObservableCollection<IHotasBaseMap>();
+            SeedButtonMapProfileFromDeviceCapabilities(deviceButtons);
+
+            foreach (var p in profilesToMergeIn)
+            {
+                var d = deviceButtons.ToObservableCollection();//make a copy since we could have more than 1 profile and we don't need to rescan caps
+                mergedModeProfiles.Add(p.Key, MergeMaps(d, p.Value));
+            }
+
+            ModeProfiles = mergedModeProfiles;
+            _hotasQueue?.SetModeProfiles(ModeProfiles);
         }
 
         /// <summary>
diff --git a/src/Models/IHOTASDevice.cs b/src/Models/IHOTASDevice.cs
index 8270618..bfab810 100644
--- a/src/Models/IHOTASDevice.cs
+++ b/src/Models/IHOTASDevice.cs
@@ -32,6 +32,7 @@ public interface IHOTASDevice
         void CopyModeProfileFromTemplate(int templateModeSource, int destinationMode);
         void ListenAsync();
         void OverlayAllProfilesToDevice();
+        void OverlayAllProfilesToDevice(Dictionary<int, ObservableCollection<IHotasBaseMap>> profilesToMergeIn);
         void ApplyButtonMap(ObservableCollection<IHotasBaseMap> existingButtonMap);
         void SetMode(int mode);
         void ForceButtonPress(JoystickOffset offset, bool isDown);
diff --git a/src/ViewModels/ActionCatalogViewModel.cs b/src/ViewModels/ActionCatalogViewModel.cs
index bbec0be..0501ebb 100644
--- a/src/ViewModels/ActionCatalogViewModel.cs
+++ b/src/ViewModels/ActionCatalogViewModel.cs
@@ -53,6 +53,12 @@ public void Add(ButtonMapViewModel buttonMap)
             Logging.Log.Debug($"{item.ActionName} - {buttonMap.ButtonName} added to actions catalog");
         }
 
+        public ActionCatalogItem Get(string actionName)
+        {
+            if (!Contains(actionName)) return null;
+            return Catalog.First(x => x.ActionName == actionName);
+        }
+
         private void AddEmptyItem()
         {
             Add(new ActionCatalogItem() { NoAction = true, ActionName = NO_ACTION_TEXT, Actions = new ObservableCollection<ButtonAction>() });
diff --git a/src/ViewModels/HOTASCollectionViewModel.cs b/src/ViewModels/HOTASCollectionViewModel.cs
index 92a07e3..c4b2515 100644
--- a/src/ViewModels/HOTASCollectionViewModel.cs
+++ b/src/ViewModels/HOTASCollectionViewModel.cs
@@ -346,7 +346,7 @@ private void AddActivity(IHotasBaseMap map, KeystrokeSentEventArgs e)
                 Activity.Insert(0, activity);
                 if (Activity.Count >= 200)
                 {
-                    Activity.RemoveAt(Activity.Count-1);
+                    Activity.RemoveAt(Activity.Count - 1);
                 }
             });
         }
@@ -405,7 +405,6 @@ private void BuildDevicesViewModelFromLoadedDevices(IHOTASCollection loadedDevic
                 {
                     Logging.Log.Warn($"Loaded mappings for {ld.Name}, but could not find the device attached!");
                     Logging.Log.Warn($"Mappings will be displayed, but they will not function");
-                    //deviceVm = new DeviceViewModel(_appDispatcher, _fileSystem, _mediaPlayerFactory, ld);
                     deviceVm = _deviceViewModelFactory.CreateDeviceViewModel(_appDispatcher, _fileSystem, _mediaPlayerFactory, ld);
                     Devices.Add(deviceVm);
                     _deviceList.AddDevice(ld);
@@ -415,8 +414,9 @@ private void BuildDevicesViewModelFromLoadedDevices(IHOTASCollection loadedDevic
                 {
                     d = _deviceList.GetDevice(ld.DeviceId);
                     if (d == null) continue;
+                    d.OverlayAllProfilesToDevice(ld.ModeProfiles);
+                    d.ApplyButtonMap(d.ModeProfiles[d.ModeProfiles.Keys.Min()].ToObservableCollection());
                 }
-                d.SetModeProfile(ld.ModeProfiles);
                 deviceVm.RebuildMap(d.ButtonMap);
             }
         }
@@ -524,8 +524,6 @@ private void LoadHotas(IHOTASCollection loadedDeviceList)
             AddHandlers();
             ProfileSetFileName = _fileSystem.LastSavedFileName;
 
-            //since the JSON file may have less button maps than are on the device, we need to overlay them individually instead of replacing the whole collection
-            _deviceList.ApplyButtonMapToAllProfiles();
             _deviceList.AutoSetMode();
             _deviceList.ListenToAllDevices();
 
@@ -579,6 +577,11 @@ private void ReBuildActionCatalog()
                                 }
                             case HOTASButton buttonMap:
                                 {
+                                    if (ActionCatalog.Contains(buttonMap.ActionName))
+                                    {
+                                        buttonMap.ActionCatalogItem = ActionCatalog.Get(buttonMap.ActionName);
+                                        break;
+                                    }
                                     AddButtonToCatalog(buttonMap.ActionName, buttonMap.ActionCatalogItem.Actions, buttonMap.MapName);
                                     break;
                                 }
@@ -592,6 +595,12 @@ private void AddButtonListToCatalog(ObservableCollection<HOTASButton> mapList)
         {
             foreach (var baseMap in mapList)
             {
+                if (ActionCatalog.Contains(baseMap.ActionName))
+                {
+                    //baseMap.ActionCatalogItem.Actions = ActionCatalog.Get(baseMap.ActionName).Actions;
+                    baseMap.ActionCatalogItem = ActionCatalog.Get(baseMap.ActionName);
+                    break;
+                }
                 AddButtonToCatalog(baseMap.ActionName, baseMap.ActionCatalogItem.Actions, baseMap.MapName);
             }
         }
diff --git a/tests/HOTASCollectionViewModelTests.cs b/tests/HOTASCollectionViewModelTests.cs
index 0616665..aeb8183 100644
--- a/tests/HOTASCollectionViewModelTests.cs
+++ b/tests/HOTASCollectionViewModelTests.cs
@@ -583,7 +583,7 @@ public void file_open_command_valid_file_existing_device()
             existingDevice.DeviceId = existingDeviceId;
             existingDevice.Name = "existing device";
             existingDevice.Capabilities = new Capabilities() { AxeCount = 2, ButtonCount = 1 };
-            
+
 
             AddHotasButtonMap(existingDevice.ButtonMap, existingButtonMapId);
 
@@ -937,7 +937,7 @@ public void add_activity_keystroke_down()
         {
             var hotasVm = CreateHotasCollectionViewModel(out _, out var subDeviceList, out _, out _, out _, out _);
             hotasVm.Initialize();
-            
+
             IHOTASQueue queue = new HOTASQueue(Substitute.For<IKeyboard>());
             IHotasBaseMap map = new HOTASButton() { Type = HOTASButton.ButtonType.Button, ActionName = "test action" };
             queue.SetButtonMap(new ObservableCollection<IHotasBaseMap>() { map });
@@ -1131,16 +1131,25 @@ public void load_profile()
 
             var hotasVm = CreateHotasCollectionViewModel(out var subFileSystem, out var subQuickProfilePanelVm);
 
-            var subHotasCollection = CreateHotasCollectionSubstitute();
-            subHotasCollection.Devices.Add(new HOTASDevice()
+            var device = new HOTASDevice()
             {
-                DeviceId = deviceId,
-                ButtonMap =
+                DeviceId = deviceId
+            };
+
+
+            var profile = new Dictionary<int, ObservableCollection<IHotasBaseMap>>();
+            var map = new ObservableCollection<IHotasBaseMap>()
             {
-                new HOTASButton(){MapId = 43, Type = HOTASButton.ButtonType.Button, ActionCatalogItem = new ActionCatalogItem(){ActionName = "test action 1"}},
-                new HOTASButton(){MapId = 44, Type = HOTASButton.ButtonType.Button, ActionCatalogItem = new ActionCatalogItem(){ActionName = "test action 2"}},
-            }
-            });
+                new HOTASButton() { MapId = 43, Type = HOTASButton.ButtonType.Button, ActionCatalogItem = new ActionCatalogItem() { ActionName = "test action 1" } },
+                new HOTASButton() { MapId = 44, Type = HOTASButton.ButtonType.Button, ActionCatalogItem = new ActionCatalogItem() { ActionName = "test action 2" } }
+
+            };
+            profile.Add(1, map);
+
+            device.SetModeProfile(profile);
+
+            var subHotasCollection = CreateHotasCollectionSubstitute();
+            subHotasCollection.Devices.Add(device);
 
             subFileSystem.FileOpen(Arg.Any<string>()).ReturnsForAnyArgs(subHotasCollection);
             subFileSystem.LastSavedFileName.Returns("last saved file");
@@ -1180,11 +1189,22 @@ public void load_profile_add_button_list_to_catalog()
                     new HOTASAxis() {MapName = "test2", MapId = 44, Type = HOTASButton.ButtonType.AxisLinear, ButtonMap = new ObservableCollection<HOTASButton>(){new HOTASButton(){MapName = "bm2", ActionName = "abm2", ActionCatalogItem = new ActionCatalogItem(){ActionName = "action2", Actions = new ObservableCollection<ButtonAction>(){new ButtonAction(){ScanCode = 2}}}}}},
                 }
             };
-            subDevice.ModeProfiles.Add(43, new ObservableCollection<IHotasBaseMap>());
-            subHotasCollection.Devices.Add(subDevice);
 
 
 
+
+            var profile = new Dictionary<int, ObservableCollection<IHotasBaseMap>>();
+            var map = new ObservableCollection<IHotasBaseMap>()
+            {
+                new HOTASAxis() {MapName = "test1", MapId = 43, Type = HOTASButton.ButtonType.AxisLinear, ButtonMap = new ObservableCollection<HOTASButton>(){new HOTASButton(){MapName = "bm1", ActionName = "abm1", ActionCatalogItem = new ActionCatalogItem(){ActionName = "action1", Actions = new ObservableCollection<ButtonAction>(){new ButtonAction(){ScanCode = 1}}}}}},
+                new HOTASAxis() {MapName = "test2", MapId = 44, Type = HOTASButton.ButtonType.AxisLinear, ButtonMap = new ObservableCollection<HOTASButton>(){new HOTASButton(){MapName = "bm2", ActionName = "abm2", ActionCatalogItem = new ActionCatalogItem(){ActionName = "action2", Actions = new ObservableCollection<ButtonAction>(){new ButtonAction(){ScanCode = 2}}}}}},
+            };
+            profile.Add(1, map);
+
+            subDevice.SetModeProfile(profile);
+            
+            subHotasCollection.Devices.Add(subDevice);
+
             subHotasCollection.ModeProfileActivationButtons.Add(1, new ModeActivationItem() { ButtonId = 43, DeviceId = deviceId });
             subHotasCollection.SetupNewModeProfile();