Leahnaya/HexManiacAdvance
1
0
Fork 0
mirror of https://github.com/haven1433/HexManiacAdvance.git synced 2026-10-03 05:36:34 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update table pointer field when data gets moved

Browse Source
This commit is contained in:
Benjamin Popp
2019-05-27 20:19:10 -05:00
parent 76df0b7bb0
commit ffc8a76ad8
3 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/HexManiac.Core/ViewModels/Tools/IArrayElementViewModel.cs
View File

@@ -66,6 +66,10 @@ namespace HavenSoft.HexManiac.Core.ViewModels.Tools {
(History, Model, Name, Start, Length) = (history, model, name, start, length);
content = strategy.UpdateViewModelFromModel(this);
}
public void RefreshControlFromModelChange() {
TryUpdate(ref content, strategy.UpdateViewModelFromModel(this), nameof(Content));
}
}
public class TextFieldStratgy : IFieldArrayElementViewModelStrategy {
@@ -218,6 +222,7 @@ namespace HavenSoft.HexManiac.Core.ViewModels.Tools {
public class TextStreamArrayElementViewModel : ViewModelCore, IArrayElementViewModel {
private readonly ChangeHistory<ModelDelta> history;
private readonly FieldArrayElementViewModel matchingField;
private readonly IDataModel model;
private readonly string name;
private readonly int start;
@@ -236,7 +241,10 @@ namespace HavenSoft.HexManiac.Core.ViewModels.Tools {
var run = model.GetNextRun(destination);
var data = PCSString.Convert(content);
var newRun = model.RelocateForExpansion(history.CurrentChange, run, data.Count);
if (run.Start != newRun.Start) DataMoved?.Invoke(this, (run.Start, newRun.Start));
if (run.Start != newRun.Start) {
DataMoved?.Invoke(this, (run.Start, newRun.Start));
matchingField.RefreshControlFromModelChange();
}
run = newRun;
for (int i = 0; i < data.Count; i++) history.CurrentChange.ChangeData(model, run.Start + i, data[i]);
for (int i = data.Count; i < run.Length; i++) history.CurrentChange.ChangeData(model, run.Start + i, 0xFF);
@@ -246,8 +254,9 @@ namespace HavenSoft.HexManiac.Core.ViewModels.Tools {
}
}
public TextStreamArrayElementViewModel(ChangeHistory<ModelDelta> history, IDataModel model, string name, int start) {
public TextStreamArrayElementViewModel(ChangeHistory<ModelDelta> history, FieldArrayElementViewModel matchingField, IDataModel model, string name, int start) {
this.history = history;
this.matchingField = matchingField;
this.model = model;
this.name = name;
this.start = start;

5
src/HexManiac.Core/ViewModels/Tools/TableTool.cs
View File

@@ -162,9 +162,10 @@ namespace HavenSoft.HexManiac.Core.ViewModels.Tools {
Children.Add(viewModel);
viewModel.DataChanged += ForwardModelChanged;
if (item is ArrayRunPointerSegment pointerSegment) {
if (pointerSegment.DestinationDataMatchesPointerFormat(model, history.CurrentChange, model.ReadPointer(itemAddress))) {
var destination = model.ReadPointer(itemAddress);
if (destination != Pointer.NULL && pointerSegment.DestinationDataMatchesPointerFormat(model, history.CurrentChange, destination)) {
if (pointerSegment.InnerFormat == $"{PCSRun.StringDelimeter}{PCSRun.StringDelimeter}") {
var streamElement = new TextStreamArrayElementViewModel(history, model, item.Name, itemAddress);
var streamElement = new TextStreamArrayElementViewModel(history, (FieldArrayElementViewModel)viewModel, model, item.Name, itemAddress);
streamElement.DataChanged += ForwardModelChanged;
streamElement.DataMoved += ForwardModelDataMoved;
Children.Add(streamElement);

22
src/HexManiac.Tests/NestedTablesTests.cs
View File

@@ -12,12 +12,14 @@ namespace HavenSoft.HexManiac.Tests {
private readonly PokemonModel model;
private readonly ModelDelta token = new ModelDelta();
private readonly byte[] data = new byte[0x200];
private readonly List<string> messages = new List<string>();
private readonly List<string> errors = new List<string>();
public NestedTablesTests() {
model = new PokemonModel(data);
viewPort = new ViewPort("file.txt", model) { Width = 0x10, Height = 0x10 };
viewPort.OnError += (sender, e) => errors.Add(e);
viewPort.OnMessage += (sender, e) => messages.Add(e);
}
[Fact]
@@ -137,5 +139,25 @@ namespace HavenSoft.HexManiac.Tests {
Assert.Equal(2, viewPort.Tools.TableTool.Children.Count);
Assert.IsType<TextStreamArrayElementViewModel>(viewPort.Tools.TableTool.Children[1]);
}
[Fact]
public void UpdateViaToolStreamFieldThatCausesMoveAlsoUpdatesToolPointerField() {
viewPort.Edit("FF 00 23"); // put a valid end, then a spare byte, then some junk. This'll cause a move after adding enough characters.
viewPort.SelectionStart = new Point(0, 0);
viewPort.Edit("^text\"\" ?\"");
viewPort.SelectionStart = new Point(0, 4);
viewPort.Edit("^table[description<\"\">]4 <000000>"); // note that this auto-scrolls, since a table was created
viewPort.SelectionStart = new Point(0, 0);
var textViewModel = (TextStreamArrayElementViewModel)viewPort.Tools.TableTool.Children[1];
// act: use the tool to change the content, forcing a repoint
messages.Clear();
textViewModel.Content = "Xyz";
var pointerViewModel = (FieldArrayElementViewModel)viewPort.Tools.TableTool.Children[0];
Assert.Single(messages); // we repointed
Assert.NotEqual("<000000>", pointerViewModel.Content); // other tool field was updated
}
}
}