DatItems don't know about filtering

This commit is contained in:
Matt Nadareski
2020-12-13 21:47:42 -08:00
parent 67bfe0dae9
commit 3fcec263e0
40 changed files with 1325 additions and 1458 deletions

View File

@@ -5,7 +5,6 @@ using System.Xml.Serialization;
using SabreTools.Core;
using SabreTools.Core.Tools;
using SabreTools.Filtering;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
@@ -294,74 +293,6 @@ namespace SabreTools.DatItems
#region Filtering
/// <inheritdoc/>
public override bool PassesFilter(Cleaner cleaner, bool sub = false)
{
// Check common fields first
if (!base.PassesFilter(cleaner, sub))
return false;
// Filter on tag
if (!Filter.PassStringFilter(cleaner.DatItemFilter.Tag, Tag))
return false;
// Filter on display type
if (cleaner.DatItemFilter.DisplayType.MatchesPositive(DisplayType.NULL, DisplayType) == false)
return false;
if (cleaner.DatItemFilter.DisplayType.MatchesNegative(DisplayType.NULL, DisplayType) == true)
return false;
// Filter on rotation
if (!Filter.PassLongFilter(cleaner.DatItemFilter.Rotate, Rotate))
return false;
// Filter on flipx
if (!Filter.PassBoolFilter(cleaner.DatItemFilter.FlipX, FlipX))
return false;
// Filter on width
if (!Filter.PassLongFilter(cleaner.DatItemFilter.Width, Width))
return false;
// Filter on height
if (!Filter.PassLongFilter(cleaner.DatItemFilter.Height, Height))
return false;
// Filter on refresh
if (!Filter.PassDoubleFilter(cleaner.DatItemFilter.Refresh, Refresh))
return false;
// Filter on pixclock
if (!Filter.PassLongFilter(cleaner.DatItemFilter.PixClock, PixClock))
return false;
// Filter on htotal
if (!Filter.PassLongFilter(cleaner.DatItemFilter.HTotal, HTotal))
return false;
// Filter on hbend
if (!Filter.PassLongFilter(cleaner.DatItemFilter.HBEnd, HBEnd))
return false;
// Filter on hbstart
if (!Filter.PassLongFilter(cleaner.DatItemFilter.HBStart, HBStart))
return false;
// Filter on vtotal
if (!Filter.PassLongFilter(cleaner.DatItemFilter.VTotal, VTotal))
return false;
// Filter on vbend
if (!Filter.PassLongFilter(cleaner.DatItemFilter.VBEnd, VBEnd))
return false;
// Filter on vbstart
if (!Filter.PassLongFilter(cleaner.DatItemFilter.VBStart, VBStart))
return false;
return true;
}
/// <inheritdoc/>
public override void RemoveFields(
List<DatItemField> datItemFields,