Merge pull request VixenLights#584 from johncbaur/VIX-3275

VIX-3275 Default the Fixture Element Name to the Profile Name
johncbaur · Feb 4, 2024 · 0616c5c · 0616c5c
2 parents b35e765 + 69e2b73
commit 0616c5c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/Vixen.Modules/Editor/FixtureWizard/Wizard/ViewModels/EditProfileWizardPageViewModel.cs b/src/Vixen.Modules/Editor/FixtureWizard/Wizard/ViewModels/EditProfileWizardPageViewModel.cs
@@ -71,7 +71,7 @@ protected override Task<bool> SaveAsync()
             // Get the child view models
             IEnumerable<IViewModel> childViewModels = this.GetChildViewModels();
 
-            // Retreive the fixture property editor view model
+            // Retrieve the fixture property editor view model
             FixturePropertyEditorViewModel fixtureEditor = (FixturePropertyEditorViewModel)childViewModels.Single(vm => vm is FixturePropertyEditorViewModel);
 
             // Retrieve the fixture profile from the view model

diff --git a/src/Vixen.Modules/Editor/FixtureWizard/Wizard/ViewModels/GroupingWizardPageViewModel.cs b/src/Vixen.Modules/Editor/FixtureWizard/Wizard/ViewModels/GroupingWizardPageViewModel.cs
@@ -59,8 +59,11 @@ public GroupingWizardPageViewModel(GroupingWizardPage wizardPage) :
             // Default to only creating one fixture
             NumberOfFixtures = 1;
 
-            // Default the fixture prefix to 'Fixture_'
-            ElementPrefix = "Fixture_";
+            // Retrieve the select profile page model
+            SelectProfileWizardPage selectProfilePage = (SelectProfileWizardPage)Wizard.Pages.Single(page => page is SelectProfileWizardPage);
+
+			// Default the fixture prefix to the name of the profile
+			ElementPrefix = selectProfilePage.ProfileName;
 
             // Default to creating a group for the fixtures
             CreateGroup = true;