use observablecollection for lists of opcodes, add basic rendering of…

… opcodes
krogenth · Aug 20, 2023 · 4e97f9c · 4e97f9c
1 parent 642ab0e
commit 4e97f9c
Show file tree

Hide file tree

Showing 11 changed files with 392 additions and 122 deletions.
diff --git a/src/G2DataGUI.Common/Data/Maps/MapDialogue.cs b/src/G2DataGUI.Common/Data/Maps/MapDialogue.cs
@@ -3,13 +3,14 @@
 using G2DataGUI.Common.Data.Maps.MapDialogueOpcodes;
 using G2DataGUI.IO.Streams;
 using System.Linq;
+using System.Collections.ObjectModel;
 
 namespace G2DataGUI.Common.Data.Maps;
 public class MapDialogue
 {
     public MapDialogueHeader Header { get; set; }
     public List<byte[]> DialogueSections { get; set; } = new();
-	public List<List<IMapDialogueOpcode>> DialogueSectionOpcodes { get; set; } = new();
+	public ObservableCollection<ObservableCollection<IMapDialogueOpcode>> DialogueSectionOpcodes { get; set; } = new();
 
     public static MapDialogue ReadMapDialogue(Stream reader, uint dialogueSectionLength)
     {
@@ -21,7 +22,7 @@ public static MapDialogue ReadMapDialogue(Stream reader, uint dialogueSectionLen
 		var dialogueStartPosition = reader.Position;
 		for (var index = 1; index < dialogue.Header.Offsets.Count; index++)
 		{
-			dialogue.DialogueSectionOpcodes.Add(new List<IMapDialogueOpcode>());
+			dialogue.DialogueSectionOpcodes.Add(new ObservableCollection<IMapDialogueOpcode>());
 			var length = (index == dialogue.Header.Offsets.Count - 1) ?
 				(dialogueSectionLength - dialogue.Header.HeaderLength - (dialogue.Header.Offsets[index - 1].Offset * 8)) :
 				(dialogue.Header.Offsets[index].Offset - dialogue.Header.Offsets[index - 1].Offset) * 8;
@@ -40,9 +41,7 @@ public static MapDialogue ReadMapDialogue(Stream reader, uint dialogueSectionLen
 			}
 		}
 
-		//var dialogueStartPosition = reader.Position;
 		reader.Seek(dialogueStartPosition, SeekOrigin.Begin);
-		//var dialogueStartPosition = reader.Position;
 		for (var index = 1; index < dialogue.Header.Offsets.Count; index++)
 		{
 			var length = (index == dialogue.Header.Offsets.Count - 1) ?

diff --git a/src/G2DataGUI.Common/Data/Maps/MapDialogueOpcodes/PauseOpcode.cs b/src/G2DataGUI.Common/Data/Maps/MapDialogueOpcodes/PauseOpcode.cs
diff --git a/src/G2DataGUI.Common/Data/Maps/MapDialogueOpcodes/TextBox/CreateOptionsTextBoxOpcode.cs b/src/G2DataGUI.Common/Data/Maps/MapDialogueOpcodes/TextBox/CreateOptionsTextBoxOpcode.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.IO;
 using G2DataGUI.Common.Extensions;
 using G2DataGUI.IO.Streams;
@@ -15,7 +15,7 @@ public class CreateOptionsTextBoxOpcode : ITextBoxOpcode, IMapDialogueOpcode
 	public TextBoxOption Option { get; set; } = TextBoxOption.CreateOptionsTextBox;
 	public byte TextBoxLength { get; set; }
 	public byte TextBoxHeight { get; set; }
-	public IList<IMapDialogueOpcode> NestedOpcodes { get; set; } = new List<IMapDialogueOpcode>();
+	public ObservableCollection<IMapDialogueOpcode> NestedOpcodes { get; set; } = new();
 
 	public static IMapDialogueOpcode ReadOpcode(Stream reader)
 	{

diff --git a/src/G2DataGUI.Common/Data/Maps/MapDialogueOpcodes/TextBox/CreateOverworldTextBoxOpcode.cs b/src/G2DataGUI.Common/Data/Maps/MapDialogueOpcodes/TextBox/CreateOverworldTextBoxOpcode.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.IO;
 using G2DataGUI.Common.Extensions;
 using G2DataGUI.IO.Streams;
@@ -11,7 +11,7 @@ public class CreateOverworldTextBoxOpcode : ITextBoxOpcode, IMapDialogueOpcodeRe
 	public TextBoxOption Option { get; set; } = TextBoxOption.CreateOverworldTextBox;
 	public byte TextBoxLength { get; set; }
 	public byte TextBoxHeight { get; set; }
-	public IList<IMapDialogueOpcode> NestedOpcodes { get; set; } = new List<IMapDialogueOpcode>();
+	public ObservableCollection<IMapDialogueOpcode> NestedOpcodes { get; set; } = new();
 
 	public static IMapDialogueOpcode ReadOpcode(Stream reader)
 	{

diff --git a/src/G2DataGUI.Common/Data/Maps/MapDialogueOpcodes/TextBox/CreateSubTextBoxOpcode.cs b/src/G2DataGUI.Common/Data/Maps/MapDialogueOpcodes/TextBox/CreateSubTextBoxOpcode.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.IO;
 using G2DataGUI.Common.Extensions;
 using G2DataGUI.IO.Streams;
@@ -16,7 +16,7 @@ internal class CreateSubTextBoxOpcode : ITextBoxOpcode, IMapDialogueOpcode
 	public TextBoxOption Option { get; set; } = TextBoxOption.CreateSubTextBox;
 	public byte Unknown1 { get; set; }
 	public byte TextBoxHeight { get; set; }
-	public IList<IMapDialogueOpcode> NestedOpcodes { get; set; } = new List<IMapDialogueOpcode>();
+	public ObservableCollection<IMapDialogueOpcode> NestedOpcodes { get; set; } = new();
 
 	public static IMapDialogueOpcode ReadOpcode(Stream reader)
 	{

diff --git a/src/G2DataGUI.Common/Data/Maps/MapDialogueOpcodes/TextBox/CreateTextBoxOpcode.cs b/src/G2DataGUI.Common/Data/Maps/MapDialogueOpcodes/TextBox/CreateTextBoxOpcode.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.IO;
 using G2DataGUI.Common.Extensions;
 using G2DataGUI.IO.Streams;
@@ -9,7 +9,7 @@ public class CreateTextBoxOpcode : ITextBoxOpcode, IMapDialogueOpcodeReader
 {
 	public DialogueOpcode Opcode { get; set; } = DialogueOpcode.TextBox;
 	public TextBoxOption Option { get; set; } = TextBoxOption.CreateTextBox;
-	public IList<IMapDialogueOpcode> NestedOpcodes { get; set; } = new List<IMapDialogueOpcode>();
+	public ObservableCollection<IMapDialogueOpcode> NestedOpcodes { get; set; } = new();
 
 	public static IMapDialogueOpcode ReadOpcode(Stream reader)
 	{

diff --git a/src/G2DataGUI.Common/Data/Maps/MapDialogueOpcodes/TextBox/ITextBoxOpcode.cs b/src/G2DataGUI.Common/Data/Maps/MapDialogueOpcodes/TextBox/ITextBoxOpcode.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.IO;
 using G2DataGUI.Common.Extensions;
 using G2DataGUI.IO.Streams;
@@ -8,7 +8,7 @@ namespace G2DataGUI.Common.Data.Maps.MapDialogueOpcodes.TextBox;
 public interface ITextBoxOpcode : IMapDialogueOpcode, IMapDialogueOpcodeReader
 {
 	TextBoxOption Option { get; set; }
-	public IList<IMapDialogueOpcode> NestedOpcodes { get; set; }
+	public ObservableCollection<IMapDialogueOpcode> NestedOpcodes { get; set; }
 
 	public static new IMapDialogueOpcode ReadOpcode(Stream reader)
 	{

diff --git a/src/G2DataGUI.Common/Data/Maps/MapDialogueOpcodes/TextBox/RemoveTextBoxOpcode.cs b/src/G2DataGUI.Common/Data/Maps/MapDialogueOpcodes/TextBox/RemoveTextBoxOpcode.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.IO;
 
 namespace G2DataGUI.Common.Data.Maps.MapDialogueOpcodes.TextBox;
@@ -7,7 +7,7 @@ public class RemoveTextBoxOpcode : ITextBoxOpcode, IMapDialogueOpcodeReader
 {
 	public DialogueOpcode Opcode { get; set; } = DialogueOpcode.TextBox;
 	public TextBoxOption Option { get; set; } = TextBoxOption.RemoveTextBox;
-	public IList<IMapDialogueOpcode> NestedOpcodes { get; set; } = new List<IMapDialogueOpcode>();
+	public ObservableCollection<IMapDialogueOpcode> NestedOpcodes { get; set; } = new();
 
 	public static IMapDialogueOpcode ReadOpcode(Stream reader)
 	{

diff --git a/src/G2DataGUI/UI/Selectors/MapOpcodeSelector.cs b/src/G2DataGUI/UI/Selectors/MapOpcodeSelector.cs
@@ -1,15 +1,30 @@
 using System.Collections.Generic;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
+using Avalonia.Data;
+using Avalonia.Markup.Xaml.Templates;
 using Avalonia.Metadata;
 using G2DataGUI.Common.Data.Maps.MapDialogueOpcodes;
 
 namespace G2DataGUI.UI.Selectors;
-public class MapOpcodeSelector : IDataTemplate
+
+public class MapOpcodeSelector : ITreeDataTemplate
 {
 	[Content]
 	public Dictionary<string, IDataTemplate> Templates { get; private set; } = new();
 
+	public InstancedBinding ItemsSelector(object item)
+	{
+		if (item is IMapDialogueOpcode opcode)
+		{
+			return ((TreeDataTemplate)Templates[opcode.GetType().Name]).ItemsSelector(item);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
 	public IControl Build(object data) =>
 		Templates[data.GetType().Name].Build(data);
 

diff --git a/src/G2DataGUI/UI/ViewModels/MapDialogueViewModel.cs b/src/G2DataGUI/UI/ViewModels/MapDialogueViewModel.cs
@@ -1,14 +1,14 @@
-using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using G2DataGUI.Common.Data.Maps.MapDialogueOpcodes;
 using G2DataGUI.UI.Common.ViewModels;
 
 namespace G2DataGUI.UI.ViewModels;
 
 public class MapDialogueViewModel : BaseViewModel
 {
-	private List<List<IMapDialogueOpcode>> _selectedMapDialogueOpcodes = new();
+	private ObservableCollection<ObservableCollection<IMapDialogueOpcode>> _selectedMapDialogueOpcodes = new();
 	private int _selectedMapDialogueOpcodeIndex;
-	private List<IMapDialogueOpcode> _selectedMapDialogueOpcodeItem;
+	private ObservableCollection<IMapDialogueOpcode> _selectedMapDialogueOpcodeItem;
 
 	public static MapDialogueViewModel Instance { get; private set; } = new();
 
@@ -17,12 +17,12 @@ private MapDialogueViewModel()
 		SelectedMapDialogueOpcodeIndex = 0;
 	}
 
-	public List<List<IMapDialogueOpcode>> SelectedMapDialogueOpcodes
+	public ObservableCollection<ObservableCollection<IMapDialogueOpcode>> SelectedMapDialogueOpcodes
 	{
 		get => _selectedMapDialogueOpcodes;
 		set
 		{
-			_selectedMapDialogueOpcodes = value == null ? new List<List<IMapDialogueOpcode>>() : value;
+			_selectedMapDialogueOpcodes = value == null ? new ObservableCollection<ObservableCollection<IMapDialogueOpcode>>() : value;
 			SelectedMapDialogueOpcodeIndex = 0;
 			OnPropertyChanged(nameof(SelectedMapDialogueOpcodes));
 			OnPropertyChanged(nameof(HasDialogueOpcodes));
@@ -52,7 +52,7 @@ public int SelectedMapDialogueOpcodeIndex
 		}
 	}
 
-	public List<IMapDialogueOpcode> SelectedMapDialogueOpcodeItem
+	public ObservableCollection<IMapDialogueOpcode> SelectedMapDialogueOpcodeItem
 	{
 		get => _selectedMapDialogueOpcodeItem;
 		set