Merge branch 'master' of https://github.com/donkeyProgramming/TheAssetEditor

Author: donkeyProgramming

Diff for: Editors/Audio/AudioEditor/AudioProjectService.cs renamed to Editors/Audio/AudioEditor/AudioEditorService.cs

@@ -1,11 +1,18 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Editors.Audio.AudioEditor.Data;
+using Editors.Audio.AudioEditor.AudioFilesExplorer;
+using Editors.Audio.AudioEditor.AudioProjectData;
+using Editors.Audio.AudioEditor.AudioProjectEditor;
+using Editors.Audio.AudioEditor.AudioProjectExplorer;
+using Editors.Audio.AudioEditor.AudioProjectViewer;
+using Editors.Audio.AudioEditor.AudioSettings;
+using Editors.Audio.AudioEditor.DataGrids;
 using Editors.Audio.AudioProjectCompiler;
 using Editors.Audio.GameSettings.Warhammer3;
 using Serilog;
@@ -15,12 +22,13 @@
 using Shared.Core.Services;
 using static Editors.Audio.GameSettings.Warhammer3.DialogueEvents;
 using static Editors.Audio.GameSettings.Warhammer3.StateGroups;
+using TreeNode = Editors.Audio.AudioEditor.AudioProjectExplorer.TreeNode;
 
 namespace Editors.Audio.AudioEditor
 {
-    public class AudioProjectService : IAudioProjectService
+    public class AudioEditorService : IAudioEditorService
     {
-        readonly ILogger _logger = Logging.Create<AudioProjectService>();
+        readonly ILogger _logger = Logging.Create<AudioEditorService>();
 
         private readonly IPackFileService _packFileService;
         private readonly IFileSaveService _fileSaveService;
@@ -31,7 +39,7 @@ public class AudioProjectService : IAudioProjectService
         private readonly WemGenerator _wemGenerator;
         private readonly DatGenerator _datGenerator;
 
-        public AudioProjectService(
+        public AudioEditorService(
             IPackFileService packFileService,
             IFileSaveService fileSaveService,
             IStandardDialogs standardDialogs,
@@ -54,9 +62,15 @@ public AudioProjectService(
         public AudioProject AudioProject { get; set; }
         public string AudioProjectFileName { get; set; }
         public string AudioProjectDirectory { get; set; }
-        public Dictionary<string, List<string>> StateGroupsWithModdedStatesRepository { get; set; } = [];
+        public AudioEditorViewModel AudioEditorViewModel { get; set; }
+        public AudioProjectExplorerViewModel AudioProjectExplorerViewModel { get; set; }
+        public AudioFilesExplorerViewModel AudioFilesExplorerViewModel { get; set; }
+        public AudioProjectEditorViewModel AudioProjectEditorViewModel { get; set; }
+        public AudioProjectViewerViewModel AudioProjectViewerViewModel { get; set; }
+        public AudioSettingsViewModel AudioSettingsViewModel { get; set; }
+        public Dictionary<string, List<string>> ModdedStatesByStateGroupLookup { get; set; } = [];
         public Dictionary<string, List<string>> DialogueEventsWithStateGroupsWithIntegrityError { get; set; } = [];
-        public Dictionary<string, DialogueEventPreset?> DialogueEventSoundBankFiltering { get; set; } = [];
+        public Dictionary<string, DialogueEventPreset?> DialogueEventSoundBankFiltering { get; set; } = []; // TODO: Check if unused? Also check for other unused functions.
 
         public void SaveAudioProject()
         {
@@ -88,10 +102,10 @@ public void LoadAudioProject(AudioEditorViewModel audioEditorViewModel)
                 var bytes = file.DataSource.ReadData();
                 var audioProjectJson = Encoding.UTF8.GetString(bytes);
 
-                audioEditorViewModel.AudioProjectExplorerViewModel.AudioProjectExplorerLabel = $"Audio Project Explorer - {DataHelpers.AddExtraUnderscoresToString(fileName)}";
+                audioEditorViewModel.AudioProjectExplorerViewModel.AudioProjectExplorerLabel = $"Audio Project Explorer - {DataGridHelpers.AddExtraUnderscoresToString(fileName)}";
 
                 // Reset data
-                audioEditorViewModel.ResetAudioEditorViewModelData();
+                audioEditorViewModel.ResetAudioEditorData();
                 ResetAudioProject();
 
                 // Set the AudioProject
@@ -100,24 +114,24 @@ public void LoadAudioProject(AudioEditorViewModel audioEditorViewModel)
                 AudioProjectDirectory = filePath.Replace($"\\{fileName}", string.Empty);
 
                 // Initialise a full Audio Project and merge the saved Audio Project with it
-                InitialiseAudioProject(audioEditorViewModel, AudioProjectFileName, AudioProjectDirectory, savedProject.Language);
+                InitialiseAudioProject(AudioProjectFileName, AudioProjectDirectory, savedProject.Language);
                 MergeSavedAudioProjectIntoAudioProjectWithUnusedItems(savedProject);
 
                 // Initialise data after AudioProject is set so it uses the correct instance
-                audioEditorViewModel.Initialise();
+                audioEditorViewModel.InitialiseAudioEditorData();
 
                 // Get the Modded States and prepare them for being added to the DataGrid ComboBoxes
-                BuildStateGroupsWithModdedStatesRepository(AudioProject.StateGroups, StateGroupsWithModdedStatesRepository);
+                BuildModdedStatesByStateGroupLookup(AudioProject.StateGroups, ModdedStatesByStateGroupLookup);
 
                 _integrityChecker.CheckAudioProjectDialogueEventIntegrity(this);
 
                 _logger.Here().Information($"Loaded Audio Project: {fileName}");
             }
         }
 
-        public void InitialiseAudioProject(AudioEditorViewModel audioEditorViewModel, string fileName, string directory, string language)
+        public void InitialiseAudioProject(string fileName, string directory, string language)
         {
-            audioEditorViewModel.AudioProjectExplorerViewModel.AudioProjectExplorerLabel = $"Audio Project Explorer - {DataHelpers.AddExtraUnderscoresToString(fileName)}";
+            AudioEditorViewModel.AudioProjectExplorerViewModel.AudioProjectExplorerLabel = $"Audio Project Explorer - {DataGridHelpers.AddExtraUnderscoresToString(fileName)}";
 
             AudioProjectFileName = fileName;
             AudioProjectDirectory = directory;
@@ -129,7 +143,7 @@ public void InitialiseAudioProject(AudioEditorViewModel audioEditorViewModel, st
 
             SortSoundBanksAlphabetically();
 
-            audioEditorViewModel.AudioProjectExplorerViewModel.CreateAudioProjectTree();
+            AudioEditorViewModel.AudioProjectExplorerViewModel.CreateAudioProjectTree();
         }
 
         public void CompileAudioProject()
@@ -238,23 +252,23 @@ public void SortSoundBanksAlphabetically()
                 AudioProject.SoundBanks.Add(soundBank);
         }
 
-        public void BuildStateGroupsWithModdedStatesRepository(List<StateGroup> moddedStateGroups, Dictionary<string, List<string>> stateGroupsWithModdedStatesRepository)
+        public void BuildModdedStatesByStateGroupLookup(List<StateGroup> moddedStateGroups, Dictionary<string, List<string>> moddedStatesByStateGroupLookup)
         {
-            if (stateGroupsWithModdedStatesRepository == null)
-                stateGroupsWithModdedStatesRepository = new Dictionary<string, List<string>>();
+            if (moddedStatesByStateGroupLookup == null)
+                moddedStatesByStateGroupLookup = new Dictionary<string, List<string>>();
             else
-                stateGroupsWithModdedStatesRepository.Clear();
+                moddedStatesByStateGroupLookup.Clear();
 
             foreach (var stateGroup in moddedStateGroups)
             {
                 if (stateGroup.States != null && stateGroup.States.Count > 0)
                 {
                     foreach (var state in stateGroup.States)
                     {
-                        if (!stateGroupsWithModdedStatesRepository.ContainsKey(stateGroup.Name))
-                            stateGroupsWithModdedStatesRepository[stateGroup.Name] = new List<string>();
+                        if (!moddedStatesByStateGroupLookup.ContainsKey(stateGroup.Name))
+                            moddedStatesByStateGroupLookup[stateGroup.Name] = new List<string>();
 
-                        stateGroupsWithModdedStatesRepository[stateGroup.Name].Add(state.Name);
+                        moddedStatesByStateGroupLookup[stateGroup.Name].Add(state.Name);
                     }
                 }
             }
@@ -392,5 +406,25 @@ public void ResetAudioProject()
         {
             AudioProject = new AudioProject();
         }
+
+        public TreeNode GetSelectedExplorerNode()
+        {
+            return AudioProjectExplorerViewModel._selectedAudioProjectTreeNode;
+        }
+
+        public ObservableCollection<Dictionary<string, string>> GetEditorDataGrid()
+        {
+            return AudioProjectEditorViewModel.AudioProjectEditorDataGrid;
+        }
+
+        public ObservableCollection<Dictionary<string, string>> GetViewerDataGrid()
+        {
+            return AudioProjectViewerViewModel.AudioProjectViewerDataGrid;
+        }
+
+        public ObservableCollection<Dictionary<string, string>> GetSelectedViewerRows()
+        {
+            return AudioProjectViewerViewModel.SelectedDataGridRows;
+        }
     }
 }

Diff for: Editors/Audio/AudioEditor/AudioEditorViewModel.cs

@@ -23,7 +23,7 @@ public partial class AudioEditorViewModel : ObservableObject, IEditorInterface
 
         private readonly IPackFileService _packFileService;
         private readonly IStandardDialogs _standardDialogs;
-        private readonly IAudioProjectService _audioProjectService;
+        private readonly IAudioEditorService _audioEditorService;
         private readonly IntegrityChecker _integrityChecker;
 
         public string DisplayName { get; set; } = "Audio Editor";
@@ -36,54 +36,65 @@ public AudioEditorViewModel(
             AudioSettingsViewModel audioSettingsViewModel,
             IPackFileService packFileService,
             IStandardDialogs standardDialogs,
-            IAudioProjectService audioProjectService,
+            IAudioEditorService audioEditorService,
             IntegrityChecker integrityChecker)
         {
-            AudioProjectExplorerViewModel = audioProjectExplorerViewModel;
-            AudioProjectExplorerViewModel.AudioEditorViewModel = this;
+            _packFileService = packFileService;
+            _standardDialogs = standardDialogs;
+            _audioEditorService = audioEditorService;
+            _integrityChecker = integrityChecker;
 
+            AudioProjectExplorerViewModel = audioProjectExplorerViewModel;
             AudioFilesExplorerViewModel = audioFilesExplorerViewModel;
-            AudioFilesExplorerViewModel.AudioEditorViewModel = this;
-
             AudioProjectEditorViewModel = audioProjectEditorViewModel;
-            AudioProjectEditorViewModel.AudioEditorViewModel = this;
-
             AudioProjectViewerViewModel = audioProjectViewerViewModel;
-            AudioProjectViewerViewModel.AudioEditorViewModel = this;
-
             AudioSettingsViewModel = audioSettingsViewModel;
 
-            _packFileService = packFileService;
-            _standardDialogs = standardDialogs;
-            _audioProjectService = audioProjectService;
-            _integrityChecker = integrityChecker;
+            InitialiseAudioEditorData();
 
-            Initialise();
+            InitialiseAudioEditorService();
 
-            _integrityChecker.CheckAudioEditorDialogueEventIntegrity(DialogueEventData);
+            _integrityChecker.CheckDialogueEventIntegrity(DialogueEventData);
         }
 
         [RelayCommand] public void NewAudioProject()
         {
-            NewAudioProjectWindow.Show(this, _packFileService, _audioProjectService, _standardDialogs);
+            NewAudioProjectWindow.Show(_packFileService, _audioEditorService, _standardDialogs);
         }
 
         [RelayCommand] public void SaveAudioProject()
         {
-            _audioProjectService.SaveAudioProject();
+            _audioEditorService.SaveAudioProject();
         }
 
         [RelayCommand] public void LoadAudioProject()
         {
-            _audioProjectService.LoadAudioProject(this);
+            _audioEditorService.LoadAudioProject(this);
         }
 
         [RelayCommand] public void CompileAudioProject()
         {
-            _audioProjectService.CompileAudioProject();
+            _audioEditorService.CompileAudioProject();
         }
 
-        public void ResetAudioEditorViewModelData()
+        public void InitialiseAudioEditorData()
+        {
+            AudioProjectEditorViewModel.AudioProjectEditorDataGrid = [];
+            AudioProjectViewerViewModel.AudioProjectViewerDataGrid = [];
+            AudioProjectViewerViewModel.SelectedDataGridRows = [];
+            AudioProjectViewerViewModel.CopiedDataGridRows = [];
+            AudioProjectExplorerViewModel.DialogueEventPresets = [];
+        }
+        private void InitialiseAudioEditorService()
+        {
+            _audioEditorService.AudioEditorViewModel = this;
+            _audioEditorService.AudioProjectExplorerViewModel = AudioProjectExplorerViewModel;
+            _audioEditorService.AudioFilesExplorerViewModel = AudioFilesExplorerViewModel;
+            _audioEditorService.AudioProjectEditorViewModel = AudioProjectEditorViewModel;
+            _audioEditorService.AudioProjectViewerViewModel = AudioProjectViewerViewModel;
+            _audioEditorService.AudioSettingsViewModel = AudioSettingsViewModel;
+        }
+        public void ResetAudioEditorData()
         {
             AudioProjectEditorViewModel.AudioProjectEditorDataGrid = null;
             AudioProjectViewerViewModel.AudioProjectViewerDataGrid = null;
@@ -93,19 +104,10 @@ public void ResetAudioEditorViewModelData()
             AudioProjectExplorerViewModel.AudioProjectTree.Clear();
         }
 
-        public void Initialise()
-        {
-            AudioProjectEditorViewModel.AudioProjectEditorDataGrid = [];
-            AudioProjectViewerViewModel.AudioProjectViewerDataGrid = [];
-            AudioProjectViewerViewModel.SelectedDataGridRows = [];
-            AudioProjectViewerViewModel.CopiedDataGridRows = [];
-            AudioProjectExplorerViewModel.DialogueEventPresets = [];
-        }
-
         public void Close()
         {
-            ResetAudioEditorViewModelData();
-            _audioProjectService.ResetAudioProject();
+            ResetAudioEditorData();
+            _audioEditorService.ResetAudioProject();
         }
     }
 }