Leahnaya/HexManiacAdvance
1
0
Fork 0
mirror of https://github.com/haven1433/HexManiacAdvance.git synced 2026-06-01 04:53:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

allow TableStreamRun to match an ArrayRun if the format matches

Browse Source 
This can happen if the user gives a name to a tablestreamrun with a fixed length - it becomes an ArrayRun.

Allow the StreamElementViewModel to accept pointers of both streams and arrays when judging the UsageCount.

Allow
This commit is contained in:
Haven1433 2022-09-10 20:48:51 -05:00
parent 0db2ce46e1
commit 5a104b3039
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/HexManiac.Core/Models/Runs/Factory/TableStreamRunContentStrategy.cs
View File

@ -30,7 +30,10 @@ namespace HavenSoft.HexManiac.Core.Models.Runs.Factory {
}
return false;
}
public override bool Matches(IFormattedRun run) => run is TableStreamRun streamRun && streamRun.FormatString == Format;
public override bool Matches(IFormattedRun run) {
if (run == null || run.FormatString != Format) return false;
return run is ITableRun;
}
public override IFormattedRun WriteNewRun(IDataModel owner, ModelDelta token, int source, int destination, string name, IReadOnlyList<ArrayRunElementSegment> sourceSegments) {
// don't bother checking the TryParse result: we very much expect that the data originally in the run won't fit the parse.
TableStreamRun.TryParseTableStream(owner, destination, new SortedSpan<int>(source), name, Format, sourceSegments, out var tableStream);

4
src/HexManiac.Core/ViewModels/Tools/StreamElementViewModel.cs
View File

@ -148,8 +148,8 @@ namespace HavenSoft.HexManiac.Core.ViewModels.Tools {
if (destination == Pointer.NULL) {
UsageCount = 0;
} else {
var run = Model.GetNextRun(destination) as IStreamRun;
UsageCount = run?.PointerSources?.Count ?? 0;
var run = Model.GetNextRun(destination);
UsageCount = run is IStreamRun || run is ITableRun ? run.PointerSources?.Count ?? 0 : 0;
}
}