diff --git a/Filtration.ItemFilterPreview.Tests/Filtration.ItemFilterPreview.Tests.csproj b/Filtration.ItemFilterPreview.Tests/Filtration.ItemFilterPreview.Tests.csproj new file mode 100644 index 0000000..dffa068 --- /dev/null +++ b/Filtration.ItemFilterPreview.Tests/Filtration.ItemFilterPreview.Tests.csproj @@ -0,0 +1,87 @@ + + + + Debug + AnyCPU + + + 2.0 + {58CD3B9C-EBBA-4527-A81C-78B7EA9CA298} + Library + Properties + Filtration.ItemFilterPreview.Tests + Filtration.ItemFilterPreview.Tests + v4.6.1 + 8.1 + 12 + 512 + {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 10.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages + True + CodedUITest + True + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll + True + + + ..\packages\NUnit.3.0.1\lib\net45\nunit.framework.dll + True + + + + + + False + + + + + + + + + + + + + {3ab98b6e-05db-44fa-9dad-584aa88f0739} + Filtration.ItemFilterPreview + + + {4aac3beb-1dc1-483e-9d11-0e9334e80227} + Filtration.ObjectModel + + + + + + \ No newline at end of file diff --git a/Filtration.ItemFilterPreview.Tests/Properties/AssemblyInfo.cs b/Filtration.ItemFilterPreview.Tests/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..5efb46e --- /dev/null +++ b/Filtration.ItemFilterPreview.Tests/Properties/AssemblyInfo.cs @@ -0,0 +1,35 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Filtration.ItemFilterPreview.Tests")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Filtration.ItemFilterPreview.Tests")] +[assembly: AssemblyCopyright("Copyright © 2015")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("58cd3b9c-ebba-4527-a81c-78b7ea9ca298")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Filtration.ItemFilterPreview.Tests/Services/TestItemBlockItemMatcher.cs b/Filtration.ItemFilterPreview.Tests/Services/TestItemBlockItemMatcher.cs new file mode 100644 index 0000000..6653155 --- /dev/null +++ b/Filtration.ItemFilterPreview.Tests/Services/TestItemBlockItemMatcher.cs @@ -0,0 +1,127 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; +using Filtration.ItemFilterPreview.Model; +using Filtration.ItemFilterPreview.Services; +using Filtration.ObjectModel.BlockItemTypes; +using Filtration.ObjectModel.Enums; +using Moq; +using NUnit.Framework; + +namespace Filtration.ItemFilterPreview.Tests.Services +{ + [TestFixture] + public class TestItemBlockItemMatcher + { + private ItemBlockItemMatcherTestUtility _testUtility; + + [SetUp] + public void ItemBlockItemMatcherTestSetUp() + { + _testUtility = new ItemBlockItemMatcherTestUtility(); + } + + [TestCase("Test Base Type", true)] + [TestCase("Test Bas", true)] + [TestCase("T", true)] + [TestCase("Base Type", false)] + public void BaseTypeBlockItemMatch_SingleBlockItemValue_ReturnsTrue(string testInputBaseType, bool expectedResult) + { + //Arrange + var testInputItem = Mock.Of(i => i.BaseType == "Test Base Type"); + var testInputBaseTypeBlockItem = new BaseTypeBlockItem(); + testInputBaseTypeBlockItem.Items.Add(testInputBaseType); + + //Act + var result = _testUtility.ItemBlockItemMatcher.BaseTypeBlockItemMatch(testInputBaseTypeBlockItem, testInputItem); + + //Assert + Assert.AreEqual(expectedResult, result); + } + + [TestCase("Test Base Type", true)] + [TestCase("Test Bas", true)] + [TestCase("T", true)] + [TestCase("Base Type", false)] + public void BaseTypeBlockItemMatch_MultipleBlockItemValues_ReturnsCorrectResult(string testInputBaseType, bool expectedResult) + { + //Arrange + var testInputItem = Mock.Of(i => i.BaseType == "Test Base Type"); + var testInputBlockItem = new BaseTypeBlockItem(); + testInputBlockItem.Items.Add("Something else"); + testInputBlockItem.Items.Add(testInputBaseType); + testInputBlockItem.Items.Add("Blah"); + + //Act + var result = _testUtility.ItemBlockItemMatcher.BaseTypeBlockItemMatch(testInputBlockItem, testInputItem); + + //Assert + Assert.AreEqual(expectedResult, result); + } + + [TestCase("Test Item Class", true)] + [TestCase("Test It", true)] + [TestCase("T", true)] + [TestCase("Item Class", false)] + public void ItemClassBlockItemMatch_SingleBlockItemValue_ReturnsCorrectResult(string testInputBlockItemItemClass, bool expectedResult) + { + //Arrange + var testInputItem = Mock.Of(i => i.ItemClass == "Test Item Class"); + var testInputBlockItem = new ClassBlockItem(); + testInputBlockItem.Items.Add(testInputBlockItemItemClass); + + //Act + var result = _testUtility.ItemBlockItemMatcher.ClassBlockItemMatch(testInputBlockItem, testInputItem); + + //Assert + Assert.AreEqual(expectedResult, result); + } + + [TestCase(FilterPredicateOperator.Equal, 49, false)] + [TestCase(FilterPredicateOperator.Equal, 50, true)] + [TestCase(FilterPredicateOperator.Equal, 51, false)] + [TestCase(FilterPredicateOperator.GreaterThan, 49, true)] + [TestCase(FilterPredicateOperator.GreaterThan, 50, false)] + [TestCase(FilterPredicateOperator.GreaterThan, 51, false)] + [TestCase(FilterPredicateOperator.GreaterThanOrEqual, 49, true)] + [TestCase(FilterPredicateOperator.GreaterThanOrEqual, 50, true)] + [TestCase(FilterPredicateOperator.GreaterThanOrEqual, 51, false)] + [TestCase(FilterPredicateOperator.LessThan, 49, false)] + [TestCase(FilterPredicateOperator.LessThan, 50, false)] + [TestCase(FilterPredicateOperator.LessThan, 51, true)] + [TestCase(FilterPredicateOperator.LessThanOrEqual, 49, false)] + [TestCase(FilterPredicateOperator.LessThanOrEqual, 50, true)] + [TestCase(FilterPredicateOperator.LessThanOrEqual, 51, true)] + [TestCase(-1, 51, false)] + public void DropLevelBlockItemMatch_ReturnsCorrectResult(FilterPredicateOperator testInputFilterPredicateOperator, int testInputBlockItemDropLevel, bool expectedResult) + { + //Arrange + var testInputItem = Mock.Of(i => i.DropLevel == 50); + var testInputBlockItem = new DropLevelBlockItem(testInputFilterPredicateOperator, testInputBlockItemDropLevel); + + //Act + var result = _testUtility.ItemBlockItemMatcher.DropLevelBlockItemMatch(testInputBlockItem, testInputItem); + + //Assert + Assert.AreEqual(expectedResult, result); + } + + + private class ItemBlockItemMatcherTestUtility + { + public ItemBlockItemMatcherTestUtility() + { + // Mock setups + + // Class under-test instantiation + ItemBlockItemMatcher = new ItemBlockItemMatcher(); + } + + public ItemBlockItemMatcher ItemBlockItemMatcher { get; private set; } + } + } +} diff --git a/Filtration.ItemFilterPreview.Tests/Services/TestItemFilterProcessor.cs b/Filtration.ItemFilterPreview.Tests/Services/TestItemFilterProcessor.cs new file mode 100644 index 0000000..9e31fdf --- /dev/null +++ b/Filtration.ItemFilterPreview.Tests/Services/TestItemFilterProcessor.cs @@ -0,0 +1,10 @@ +using NUnit.Framework; + +namespace Filtration.ItemFilterPreview.Tests.Services +{ + [TestFixture] + public class TestItemFilterProcessor + { + + } +} diff --git a/Filtration.ItemFilterPreview.Tests/packages.config b/Filtration.ItemFilterPreview.Tests/packages.config new file mode 100644 index 0000000..447fc08 --- /dev/null +++ b/Filtration.ItemFilterPreview.Tests/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Filtration.ItemFilterPreview/App.config b/Filtration.ItemFilterPreview/App.config new file mode 100644 index 0000000..bae5d6d --- /dev/null +++ b/Filtration.ItemFilterPreview/App.config @@ -0,0 +1,6 @@ + + + + + + diff --git a/Filtration.ItemFilterPreview/App.xaml b/Filtration.ItemFilterPreview/App.xaml new file mode 100644 index 0000000..cb2d0cd --- /dev/null +++ b/Filtration.ItemFilterPreview/App.xaml @@ -0,0 +1,9 @@ + + + + + diff --git a/Filtration.ItemFilterPreview/App.xaml.cs b/Filtration.ItemFilterPreview/App.xaml.cs new file mode 100644 index 0000000..9ec48ea --- /dev/null +++ b/Filtration.ItemFilterPreview/App.xaml.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Configuration; +using System.Data; +using System.Linq; +using System.Threading.Tasks; +using System.Windows; + +namespace Filtration.ItemFilterPreview +{ + /// + /// Interaction logic for App.xaml + /// + public partial class App : Application + { + } +} diff --git a/Filtration.ItemFilterPreview/Filtration.ItemFilterPreview.csproj b/Filtration.ItemFilterPreview/Filtration.ItemFilterPreview.csproj new file mode 100644 index 0000000..86d0fa1 --- /dev/null +++ b/Filtration.ItemFilterPreview/Filtration.ItemFilterPreview.csproj @@ -0,0 +1,127 @@ + + + + + Debug + AnyCPU + {3AB98B6E-05DB-44FA-9DAD-584AA88F0739} + WinExe + Properties + Filtration.ItemFilterPreview + Filtration.ItemFilterPreview + v4.6.1 + 512 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 4 + true + + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + 4.0 + + + + + + + + MSBuild:Compile + Designer + + + + + + + + + ItemSocketsControl.xaml + + + MSBuild:Compile + Designer + + + App.xaml + Code + + + MainWindow.xaml + Code + + + Designer + MSBuild:Compile + + + + + Code + + + True + True + Resources.resx + + + True + Settings.settings + True + + + ResXFileCodeGenerator + Resources.Designer.cs + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + + + + + + {4aac3beb-1dc1-483e-9d11-0e9334e80227} + Filtration.ObjectModel + + + + + + \ No newline at end of file diff --git a/Filtration.ItemFilterPreview/MainWindow.xaml b/Filtration.ItemFilterPreview/MainWindow.xaml new file mode 100644 index 0000000..febba74 --- /dev/null +++ b/Filtration.ItemFilterPreview/MainWindow.xaml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/Filtration.ItemFilterPreview/MainWindow.xaml.cs b/Filtration.ItemFilterPreview/MainWindow.xaml.cs new file mode 100644 index 0000000..5281ccc --- /dev/null +++ b/Filtration.ItemFilterPreview/MainWindow.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Filtration.ItemFilterPreview +{ + /// + /// Interaction logic for MainWindow.xaml + /// + public partial class MainWindow : Window + { + public MainWindow() + { + InitializeComponent(); + } + } +} diff --git a/Filtration.ItemFilterPreview/Model/Item.cs b/Filtration.ItemFilterPreview/Model/Item.cs new file mode 100644 index 0000000..fec52bd --- /dev/null +++ b/Filtration.ItemFilterPreview/Model/Item.cs @@ -0,0 +1,74 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using Filtration.ObjectModel.Enums; + +namespace Filtration.ItemFilterPreview.Model +{ + public interface IItem + { + List SocketGroups { get; set; } + string ItemClass { get; set; } + string BaseType { get; set; } + int DropLevel { get; set; } + int ItemLevel { get; set; } + int Height { get; set; } + int Width { get; set; } + int Quality { get; set; } + ItemRarity ItemRarity { get; set; } + int Sockets { get; } + int LinkedSockets { get; } + } + + public class Item : IItem + { + private List _socketGroups; + + public Item(List socketGroups) + { + + } + + public List SocketGroups + { + get { return _socketGroups; } + set + { + var socketCount = value.Sum(s => s.Count); + if (socketCount < 1 || socketCount > 6) + { + throw new InvalidOperationException("An item must have between 1 and 6 sockets"); + } + + var evenSocketCount = socketCount % 2 == 0; + var maxSocketGroups = evenSocketCount ? socketCount / 2 : socketCount - 1; + var maxLinkedSocketGroups = evenSocketCount ? maxSocketGroups : maxSocketGroups - 1; + + if (value.Count > maxSocketGroups) + { + throw new InvalidOperationException("Invalid number of socket groups for the socket count of this item"); + } + + if (value.Count(s => s.Linked) > maxLinkedSocketGroups) + { + throw new InvalidOperationException("Invalid number of linked socket groups for the socket count of this item"); + } + + _socketGroups = value; + Sockets = socketCount; + LinkedSockets = value.Where(s => s.Linked).Max(s => s.Count); + } + } + + public string ItemClass { get; set; } + public string BaseType { get; set; } + public int DropLevel { get; set; } + public int ItemLevel { get; set; } + public int Height { get; set; } + public int Width { get; set; } + public int Quality { get; set; } + public ItemRarity ItemRarity { get; set; } + public int Sockets { get; private set; } + public int LinkedSockets { get; private set; } + } +} diff --git a/Filtration.ItemFilterPreview/Model/ItemCollection.cs b/Filtration.ItemFilterPreview/Model/ItemCollection.cs new file mode 100644 index 0000000..fae5a61 --- /dev/null +++ b/Filtration.ItemFilterPreview/Model/ItemCollection.cs @@ -0,0 +1,9 @@ +using System.Collections.Generic; + +namespace Filtration.ItemFilterPreview.Model +{ + class FilteredItemDictionary : Dictionary + { + + } +} diff --git a/Filtration.ItemFilterPreview/Model/Socket.cs b/Filtration.ItemFilterPreview/Model/Socket.cs new file mode 100644 index 0000000..f581fbd --- /dev/null +++ b/Filtration.ItemFilterPreview/Model/Socket.cs @@ -0,0 +1,14 @@ +using System.Windows.Media; + +namespace Filtration.ItemFilterPreview.Model +{ + public class Socket + { + public Socket(Color color) + { + Color = color; + } + + public Color Color { get; } + } +} \ No newline at end of file diff --git a/Filtration.ItemFilterPreview/Model/SocketGroup.cs b/Filtration.ItemFilterPreview/Model/SocketGroup.cs new file mode 100644 index 0000000..2792c74 --- /dev/null +++ b/Filtration.ItemFilterPreview/Model/SocketGroup.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; + +namespace Filtration.ItemFilterPreview.Model +{ + public class SocketGroup : List + { + public SocketGroup(List sockets, bool linked) + { + if (sockets.Count < 1 || sockets.Count > 6) + { + throw new InvalidOperationException("A socket group must have between 2 and 6 sockets"); + } + + + if (linked && sockets.Count < 2) + { + throw new InvalidOperationException("A linked socket group must have at least 2 sockets"); + } + + AddRange(sockets); + Linked = linked; + } + + public bool Linked { get; } + } +} \ No newline at end of file diff --git a/Filtration.ItemFilterPreview/Properties/AssemblyInfo.cs b/Filtration.ItemFilterPreview/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..0de9a68 --- /dev/null +++ b/Filtration.ItemFilterPreview/Properties/AssemblyInfo.cs @@ -0,0 +1,59 @@ +using System.Reflection; +using System.Resources; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using System.Windows; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Filtration.ItemFilterPreview")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Filtration.ItemFilterPreview")] +[assembly: AssemblyCopyright("Copyright © 2015")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +//In order to begin building localizable applications, set +//CultureYouAreCodingWith in your .csproj file +//inside a . For example, if you are using US english +//in your source files, set the to en-US. Then uncomment +//the NeutralResourceLanguage attribute below. Update the "en-US" in +//the line below to match the UICulture setting in the project file. + +//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] + + +[assembly: ThemeInfo( + ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located + //(used if a resource is not found in the page, + // or application resource dictionaries) + ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) +)] + + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] + + +[assembly: InternalsVisibleTo("Filtration.ItemFilterPreview.Tests")] +[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] diff --git a/Filtration.ItemFilterPreview/Properties/Resources.Designer.cs b/Filtration.ItemFilterPreview/Properties/Resources.Designer.cs new file mode 100644 index 0000000..2a039d7 --- /dev/null +++ b/Filtration.ItemFilterPreview/Properties/Resources.Designer.cs @@ -0,0 +1,63 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Filtration.ItemFilterPreview.Properties { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Filtration.ItemFilterPreview.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + } +} diff --git a/Filtration.ItemFilterPreview/Properties/Resources.resx b/Filtration.ItemFilterPreview/Properties/Resources.resx new file mode 100644 index 0000000..af7dbeb --- /dev/null +++ b/Filtration.ItemFilterPreview/Properties/Resources.resx @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Filtration.ItemFilterPreview/Properties/Settings.Designer.cs b/Filtration.ItemFilterPreview/Properties/Settings.Designer.cs new file mode 100644 index 0000000..d9e593c --- /dev/null +++ b/Filtration.ItemFilterPreview/Properties/Settings.Designer.cs @@ -0,0 +1,26 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Filtration.ItemFilterPreview.Properties { + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default { + get { + return defaultInstance; + } + } + } +} diff --git a/Filtration.ItemFilterPreview/Properties/Settings.settings b/Filtration.ItemFilterPreview/Properties/Settings.settings new file mode 100644 index 0000000..033d7a5 --- /dev/null +++ b/Filtration.ItemFilterPreview/Properties/Settings.settings @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Filtration.ItemFilterPreview/Services/ItemBlockItemMatcher.cs b/Filtration.ItemFilterPreview/Services/ItemBlockItemMatcher.cs new file mode 100644 index 0000000..9af5f6b --- /dev/null +++ b/Filtration.ItemFilterPreview/Services/ItemBlockItemMatcher.cs @@ -0,0 +1,65 @@ +using System; +using System.Linq; +using Filtration.ItemFilterPreview.Model; +using Filtration.ObjectModel.BlockItemBaseTypes; +using Filtration.ObjectModel.BlockItemTypes; +using Filtration.ObjectModel.Enums; + +namespace Filtration.ItemFilterPreview.Services +{ + internal interface IItemBlockItemMatcher + { + bool BaseTypeBlockItemMatch(BaseTypeBlockItem baseTypeBlockItem, IItem item); + bool ClassBlockItemMatch(ClassBlockItem classBlockItem, IItem item); + bool DropLevelBlockItemMatch(DropLevelBlockItem dropLevelBlockItem, IItem item); + } + + internal class ItemBlockItemMatcher : IItemBlockItemMatcher + { + public bool BaseTypeBlockItemMatch(BaseTypeBlockItem baseTypeBlockItem, IItem item) + { + return baseTypeBlockItem.Items.Any(b => item.BaseType.StartsWith(b)); + } + + public bool ClassBlockItemMatch(ClassBlockItem classBlockItem, IItem item) + { + return classBlockItem.Items.Any(c => item.ItemClass.StartsWith(c)); + } + + public bool DropLevelBlockItemMatch(DropLevelBlockItem dropLevelBlockItem, IItem item) + { + return NumericFilterPredicateBlockItemMatch(dropLevelBlockItem, item.DropLevel); + } + + private bool NumericFilterPredicateBlockItemMatch(T numericFilterPredicateBlockItem, int matchValue) where T : NumericFilterPredicateBlockItem + { + switch (numericFilterPredicateBlockItem.FilterPredicate.PredicateOperator) + { + case FilterPredicateOperator.Equal: + { + return matchValue == numericFilterPredicateBlockItem.FilterPredicate.PredicateOperand; + } + case FilterPredicateOperator.GreaterThan: + { + return matchValue > numericFilterPredicateBlockItem.FilterPredicate.PredicateOperand; + } + case FilterPredicateOperator.GreaterThanOrEqual: + { + return matchValue >= numericFilterPredicateBlockItem.FilterPredicate.PredicateOperand; + } + case FilterPredicateOperator.LessThan: + { + return matchValue < numericFilterPredicateBlockItem.FilterPredicate.PredicateOperand; + } + case FilterPredicateOperator.LessThanOrEqual: + { + return matchValue <= numericFilterPredicateBlockItem.FilterPredicate.PredicateOperand; + } + default: + { + return false; + } + } + } + } +} diff --git a/Filtration.ItemFilterPreview/Services/ItemFilterProcessor.cs b/Filtration.ItemFilterPreview/Services/ItemFilterProcessor.cs new file mode 100644 index 0000000..bd8edfd --- /dev/null +++ b/Filtration.ItemFilterPreview/Services/ItemFilterProcessor.cs @@ -0,0 +1,34 @@ +using System.Linq; +using Filtration.ItemFilterPreview.Model; +using Filtration.ObjectModel; +using Filtration.ObjectModel.BlockItemBaseTypes; +using Filtration.ObjectModel.BlockItemTypes; +using Filtration.ObjectModel.Enums; + +namespace Filtration.ItemFilterPreview.Services +{ + public class ItemFilterProcessor + { + private IItemFilterScript _itemFilterScript; + + public ItemFilterProcessor() + { + + } + + public void LoadItemFilterScript(IItemFilterScript itemFilterScript) + { + _itemFilterScript = itemFilterScript; + } + + public void ItemIsVisible(IItem item) + { + foreach (var block in _itemFilterScript.ItemFilterBlocks) + { + + } + } + + + } +} diff --git a/Filtration.ItemFilterPreview/UserControls/ItemSocketsControl.xaml b/Filtration.ItemFilterPreview/UserControls/ItemSocketsControl.xaml new file mode 100644 index 0000000..12e315a --- /dev/null +++ b/Filtration.ItemFilterPreview/UserControls/ItemSocketsControl.xaml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Filtration.ItemFilterPreview/UserControls/ItemSocketsControl.xaml.cs b/Filtration.ItemFilterPreview/UserControls/ItemSocketsControl.xaml.cs new file mode 100644 index 0000000..b3ef2ee --- /dev/null +++ b/Filtration.ItemFilterPreview/UserControls/ItemSocketsControl.xaml.cs @@ -0,0 +1,18 @@ +using System.Windows; + +namespace Filtration.ItemFilterPreview.UserControls +{ + public partial class ItemSocketsControl + { + public ItemSocketsControl() + { + InitializeComponent(); + } + + private void ItemSocketsControl_OnSizeChanged(object sender, SizeChangedEventArgs e) + { + const double ratio = 2d/3d; + Width = Height * ratio; + } + } +} diff --git a/Filtration.ObjectModel/Enums/FilterPredicateOperator.cs b/Filtration.ObjectModel/Enums/FilterPredicateOperator.cs index 51e11b8..8b96362 100644 --- a/Filtration.ObjectModel/Enums/FilterPredicateOperator.cs +++ b/Filtration.ObjectModel/Enums/FilterPredicateOperator.cs @@ -6,8 +6,6 @@ namespace Filtration.ObjectModel.Enums { [Description("=")] Equal, - [Description("!=")] - NotEqual, [Description("<")] LessThan, [Description("<=")] diff --git a/Filtration.ObjectModel/ItemFilterBlock.cs b/Filtration.ObjectModel/ItemFilterBlock.cs index 01da168..f9e9d7a 100644 --- a/Filtration.ObjectModel/ItemFilterBlock.cs +++ b/Filtration.ObjectModel/ItemFilterBlock.cs @@ -88,12 +88,7 @@ namespace Filtration.ObjectModel return false; } - if (startingBlockGroup.ParentGroup != null) - { - return HasBlockGroupInParentHierarchy(targetBlockGroup, startingBlockGroup.ParentGroup); - } - - return false; + return startingBlockGroup.ParentGroup != null && HasBlockGroupInParentHierarchy(targetBlockGroup, startingBlockGroup.ParentGroup); } private void OnBlockGroupStatusChanged(object sender, EventArgs e) diff --git a/Filtration.ObjectModel/ItemFilterScript.cs b/Filtration.ObjectModel/ItemFilterScript.cs index 133f382..b03b115 100644 --- a/Filtration.ObjectModel/ItemFilterScript.cs +++ b/Filtration.ObjectModel/ItemFilterScript.cs @@ -7,7 +7,19 @@ using Filtration.ObjectModel.ThemeEditor; namespace Filtration.ObjectModel { - public class ItemFilterScript + public interface IItemFilterScript + { + ObservableCollection ItemFilterBlocks { get; } + ObservableCollection ItemFilterBlockGroups { get; } + ThemeComponentCollection ThemeComponents { get; set; } + string FilePath { get; set; } + string Description { get; set; } + DateTime DateModified { get; set; } + List Validate(); + void ReplaceColors(ReplaceColorsParameterSet replaceColorsParameterSet); + } + + public class ItemFilterScript : IItemFilterScript { public ItemFilterScript() { diff --git a/Filtration.Tests/Translators/TestItemFilterBlockTranslator.cs b/Filtration.Tests/Translators/TestItemFilterBlockTranslator.cs index fe00a80..06d966a 100644 --- a/Filtration.Tests/Translators/TestItemFilterBlockTranslator.cs +++ b/Filtration.Tests/Translators/TestItemFilterBlockTranslator.cs @@ -346,7 +346,7 @@ namespace Filtration.Tests.Translators { // Arrange var inputString = "Show" + Environment.NewLine + - " LinkedSockets != 1"; + " LinkedSockets > 1"; // Act var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null); @@ -356,7 +356,7 @@ namespace Filtration.Tests.Translators Assert.AreEqual(1, result.BlockItems.Count(b => b is LinkedSocketsBlockItem)); var blockItem = result.BlockItems.OfType().First(); Assert.AreEqual(1, blockItem.FilterPredicate.PredicateOperand); - Assert.AreEqual(FilterPredicateOperator.NotEqual, blockItem.FilterPredicate.PredicateOperator); + Assert.AreEqual(FilterPredicateOperator.GreaterThan, blockItem.FilterPredicate.PredicateOperator); } [Test] @@ -364,7 +364,7 @@ namespace Filtration.Tests.Translators { // Arrange var inputString = "Show" + Environment.NewLine + - " Width != 1"; + " Width = 1"; // Act var result = _testUtility.Translator.TranslateStringToItemFilterBlock(inputString, null); @@ -374,7 +374,7 @@ namespace Filtration.Tests.Translators Assert.AreEqual(1, result.BlockItems.Count(b => b is WidthBlockItem)); var blockItem = result.BlockItems.OfType().First(); Assert.AreEqual(1, blockItem.FilterPredicate.PredicateOperand); - Assert.AreEqual(FilterPredicateOperator.NotEqual, blockItem.FilterPredicate.PredicateOperator); + Assert.AreEqual(FilterPredicateOperator.Equal, blockItem.FilterPredicate.PredicateOperator); } [Test] @@ -628,7 +628,7 @@ namespace Filtration.Tests.Translators " JunkLine Let's ignore this one!" + Environment.NewLine + " #Quality Commented out quality line" + Environment.NewLine + " Sockets >= 3" + Environment.NewLine + - " LinkedSockets != 2" + Environment.NewLine + + " LinkedSockets = 2" + Environment.NewLine + " SocketGroup RGBB RGBWW" + Environment.NewLine + " SetTextColor 50 100 3 200" + Environment.NewLine + " SetBackgroundColor 255 100 5" + Environment.NewLine + @@ -673,7 +673,7 @@ namespace Filtration.Tests.Translators Assert.AreEqual(3, socketsblockItem.FilterPredicate.PredicateOperand); var linkedSocketsblockItem = result.BlockItems.OfType().First(); - Assert.AreEqual(FilterPredicateOperator.NotEqual, linkedSocketsblockItem.FilterPredicate.PredicateOperator); + Assert.AreEqual(FilterPredicateOperator.Equal, linkedSocketsblockItem.FilterPredicate.PredicateOperator); Assert.AreEqual(2, linkedSocketsblockItem.FilterPredicate.PredicateOperand); var socketGroupblockItem = result.BlockItems.OfType().First(); @@ -1076,9 +1076,9 @@ namespace Filtration.Tests.Translators { // Arrange var expectedResult = "Show" + Environment.NewLine + - " LinkedSockets != 3"; + " LinkedSockets = 3"; - _testUtility.TestBlock.BlockItems.Add(new LinkedSocketsBlockItem(FilterPredicateOperator.NotEqual, 3)); + _testUtility.TestBlock.BlockItems.Add(new LinkedSocketsBlockItem(FilterPredicateOperator.Equal, 3)); // Act var result = _testUtility.Translator.TranslateItemFilterBlockToString(_testUtility.TestBlock); @@ -1321,7 +1321,7 @@ namespace Filtration.Tests.Translators var expectedResult = "Show" + Environment.NewLine + " ItemLevel > 70" + Environment.NewLine + " ItemLevel <= 85" + Environment.NewLine + - " DropLevel != 56" + Environment.NewLine + + " DropLevel > 56" + Environment.NewLine + " Quality > 2" + Environment.NewLine + " Rarity = Unique" + Environment.NewLine + " Sockets <= 6" + Environment.NewLine + @@ -1341,7 +1341,7 @@ namespace Filtration.Tests.Translators _testUtility.TestBlock.BlockItems.Add(new ActionBlockItem(BlockAction.Show)); _testUtility.TestBlock.BlockItems.Add(new ItemLevelBlockItem(FilterPredicateOperator.GreaterThan, 70)); _testUtility.TestBlock.BlockItems.Add(new ItemLevelBlockItem(FilterPredicateOperator.LessThanOrEqual, 85)); - _testUtility.TestBlock.BlockItems.Add(new DropLevelBlockItem(FilterPredicateOperator.NotEqual, 56)); + _testUtility.TestBlock.BlockItems.Add(new DropLevelBlockItem(FilterPredicateOperator.GreaterThan, 56)); _testUtility.TestBlock.BlockItems.Add(new QualityBlockItem(FilterPredicateOperator.GreaterThan, 2)); _testUtility.TestBlock.BlockItems.Add(new RarityBlockItem(FilterPredicateOperator.Equal, (int)ItemRarity.Unique)); var classItemblockItem = new ClassBlockItem(); diff --git a/Filtration.ThemeEditor/Filtration.ThemeEditor.csproj b/Filtration.ThemeEditor/Filtration.ThemeEditor.csproj index 5fc7f50..df93808 100644 --- a/Filtration.ThemeEditor/Filtration.ThemeEditor.csproj +++ b/Filtration.ThemeEditor/Filtration.ThemeEditor.csproj @@ -66,7 +66,6 @@ - ..\packages\MvvmLightLibs.5.2.0.0\lib\net45\System.Windows.Interactivity.dll diff --git a/Filtration.sln b/Filtration.sln index db45ba6..f404c6f 100644 --- a/Filtration.sln +++ b/Filtration.sln @@ -21,51 +21,198 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Filtration.Common", "Filtra EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Filtration.Common.Tests", "Filtration.Common.Tests\Filtration.Common.Tests.csproj", "{1E42A658-45C4-4DD9-83C5-2A10728DBDFA}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Filtration.ItemFilterPreview", "Filtration.ItemFilterPreview\Filtration.ItemFilterPreview.csproj", "{3AB98B6E-05DB-44FA-9DAD-584AA88F0739}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Filtration.ItemFilterPreview.Tests", "Filtration.ItemFilterPreview.Tests\Filtration.ItemFilterPreview.Tests.csproj", "{58CD3B9C-EBBA-4527-A81C-78B7EA9CA298}" +EndProject Global - GlobalSection(Performance) = preSolution - HasPerformanceSessions = true - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|ARM = Debug|ARM + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU + Release|ARM = Release|ARM + Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {55E0A34C-E039-43D7-A024-A4045401CDDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {55E0A34C-E039-43D7-A024-A4045401CDDA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {55E0A34C-E039-43D7-A024-A4045401CDDA}.Debug|ARM.ActiveCfg = Debug|Any CPU + {55E0A34C-E039-43D7-A024-A4045401CDDA}.Debug|ARM.Build.0 = Debug|Any CPU + {55E0A34C-E039-43D7-A024-A4045401CDDA}.Debug|x64.ActiveCfg = Debug|Any CPU + {55E0A34C-E039-43D7-A024-A4045401CDDA}.Debug|x64.Build.0 = Debug|Any CPU + {55E0A34C-E039-43D7-A024-A4045401CDDA}.Debug|x86.ActiveCfg = Debug|Any CPU + {55E0A34C-E039-43D7-A024-A4045401CDDA}.Debug|x86.Build.0 = Debug|Any CPU {55E0A34C-E039-43D7-A024-A4045401CDDA}.Release|Any CPU.ActiveCfg = Release|Any CPU {55E0A34C-E039-43D7-A024-A4045401CDDA}.Release|Any CPU.Build.0 = Release|Any CPU + {55E0A34C-E039-43D7-A024-A4045401CDDA}.Release|ARM.ActiveCfg = Release|Any CPU + {55E0A34C-E039-43D7-A024-A4045401CDDA}.Release|ARM.Build.0 = Release|Any CPU + {55E0A34C-E039-43D7-A024-A4045401CDDA}.Release|x64.ActiveCfg = Release|Any CPU + {55E0A34C-E039-43D7-A024-A4045401CDDA}.Release|x64.Build.0 = Release|Any CPU + {55E0A34C-E039-43D7-A024-A4045401CDDA}.Release|x86.ActiveCfg = Release|Any CPU + {55E0A34C-E039-43D7-A024-A4045401CDDA}.Release|x86.Build.0 = Release|Any CPU {E0693972-72C5-4E05-A9C5-A5943E4015C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E0693972-72C5-4E05-A9C5-A5943E4015C6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E0693972-72C5-4E05-A9C5-A5943E4015C6}.Debug|ARM.ActiveCfg = Debug|Any CPU + {E0693972-72C5-4E05-A9C5-A5943E4015C6}.Debug|ARM.Build.0 = Debug|Any CPU + {E0693972-72C5-4E05-A9C5-A5943E4015C6}.Debug|x64.ActiveCfg = Debug|Any CPU + {E0693972-72C5-4E05-A9C5-A5943E4015C6}.Debug|x64.Build.0 = Debug|Any CPU + {E0693972-72C5-4E05-A9C5-A5943E4015C6}.Debug|x86.ActiveCfg = Debug|Any CPU + {E0693972-72C5-4E05-A9C5-A5943E4015C6}.Debug|x86.Build.0 = Debug|Any CPU {E0693972-72C5-4E05-A9C5-A5943E4015C6}.Release|Any CPU.ActiveCfg = Release|Any CPU {E0693972-72C5-4E05-A9C5-A5943E4015C6}.Release|Any CPU.Build.0 = Release|Any CPU + {E0693972-72C5-4E05-A9C5-A5943E4015C6}.Release|ARM.ActiveCfg = Release|Any CPU + {E0693972-72C5-4E05-A9C5-A5943E4015C6}.Release|ARM.Build.0 = Release|Any CPU + {E0693972-72C5-4E05-A9C5-A5943E4015C6}.Release|x64.ActiveCfg = Release|Any CPU + {E0693972-72C5-4E05-A9C5-A5943E4015C6}.Release|x64.Build.0 = Release|Any CPU + {E0693972-72C5-4E05-A9C5-A5943E4015C6}.Release|x86.ActiveCfg = Release|Any CPU + {E0693972-72C5-4E05-A9C5-A5943E4015C6}.Release|x86.Build.0 = Release|Any CPU {4AAC3BEB-1DC1-483E-9D11-0E9334E80227}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4AAC3BEB-1DC1-483E-9D11-0E9334E80227}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4AAC3BEB-1DC1-483E-9D11-0E9334E80227}.Debug|ARM.ActiveCfg = Debug|Any CPU + {4AAC3BEB-1DC1-483E-9D11-0E9334E80227}.Debug|ARM.Build.0 = Debug|Any CPU + {4AAC3BEB-1DC1-483E-9D11-0E9334E80227}.Debug|x64.ActiveCfg = Debug|Any CPU + {4AAC3BEB-1DC1-483E-9D11-0E9334E80227}.Debug|x64.Build.0 = Debug|Any CPU + {4AAC3BEB-1DC1-483E-9D11-0E9334E80227}.Debug|x86.ActiveCfg = Debug|Any CPU + {4AAC3BEB-1DC1-483E-9D11-0E9334E80227}.Debug|x86.Build.0 = Debug|Any CPU {4AAC3BEB-1DC1-483E-9D11-0E9334E80227}.Release|Any CPU.ActiveCfg = Release|Any CPU {4AAC3BEB-1DC1-483E-9D11-0E9334E80227}.Release|Any CPU.Build.0 = Release|Any CPU + {4AAC3BEB-1DC1-483E-9D11-0E9334E80227}.Release|ARM.ActiveCfg = Release|Any CPU + {4AAC3BEB-1DC1-483E-9D11-0E9334E80227}.Release|ARM.Build.0 = Release|Any CPU + {4AAC3BEB-1DC1-483E-9D11-0E9334E80227}.Release|x64.ActiveCfg = Release|Any CPU + {4AAC3BEB-1DC1-483E-9D11-0E9334E80227}.Release|x64.Build.0 = Release|Any CPU + {4AAC3BEB-1DC1-483E-9D11-0E9334E80227}.Release|x86.ActiveCfg = Release|Any CPU + {4AAC3BEB-1DC1-483E-9D11-0E9334E80227}.Release|x86.Build.0 = Release|Any CPU {537BE676-2FF6-4995-B05B-9CFACE852EC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {537BE676-2FF6-4995-B05B-9CFACE852EC9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {537BE676-2FF6-4995-B05B-9CFACE852EC9}.Debug|ARM.ActiveCfg = Debug|Any CPU + {537BE676-2FF6-4995-B05B-9CFACE852EC9}.Debug|ARM.Build.0 = Debug|Any CPU + {537BE676-2FF6-4995-B05B-9CFACE852EC9}.Debug|x64.ActiveCfg = Debug|Any CPU + {537BE676-2FF6-4995-B05B-9CFACE852EC9}.Debug|x64.Build.0 = Debug|Any CPU + {537BE676-2FF6-4995-B05B-9CFACE852EC9}.Debug|x86.ActiveCfg = Debug|Any CPU + {537BE676-2FF6-4995-B05B-9CFACE852EC9}.Debug|x86.Build.0 = Debug|Any CPU {537BE676-2FF6-4995-B05B-9CFACE852EC9}.Release|Any CPU.ActiveCfg = Release|Any CPU {537BE676-2FF6-4995-B05B-9CFACE852EC9}.Release|Any CPU.Build.0 = Release|Any CPU + {537BE676-2FF6-4995-B05B-9CFACE852EC9}.Release|ARM.ActiveCfg = Release|Any CPU + {537BE676-2FF6-4995-B05B-9CFACE852EC9}.Release|ARM.Build.0 = Release|Any CPU + {537BE676-2FF6-4995-B05B-9CFACE852EC9}.Release|x64.ActiveCfg = Release|Any CPU + {537BE676-2FF6-4995-B05B-9CFACE852EC9}.Release|x64.Build.0 = Release|Any CPU + {537BE676-2FF6-4995-B05B-9CFACE852EC9}.Release|x86.ActiveCfg = Release|Any CPU + {537BE676-2FF6-4995-B05B-9CFACE852EC9}.Release|x86.Build.0 = Release|Any CPU {41B8F5C2-65AA-42F0-A20B-6F95B13A9F48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {41B8F5C2-65AA-42F0-A20B-6F95B13A9F48}.Debug|Any CPU.Build.0 = Debug|Any CPU + {41B8F5C2-65AA-42F0-A20B-6F95B13A9F48}.Debug|ARM.ActiveCfg = Debug|Any CPU + {41B8F5C2-65AA-42F0-A20B-6F95B13A9F48}.Debug|ARM.Build.0 = Debug|Any CPU + {41B8F5C2-65AA-42F0-A20B-6F95B13A9F48}.Debug|x64.ActiveCfg = Debug|Any CPU + {41B8F5C2-65AA-42F0-A20B-6F95B13A9F48}.Debug|x64.Build.0 = Debug|Any CPU + {41B8F5C2-65AA-42F0-A20B-6F95B13A9F48}.Debug|x86.ActiveCfg = Debug|Any CPU + {41B8F5C2-65AA-42F0-A20B-6F95B13A9F48}.Debug|x86.Build.0 = Debug|Any CPU {41B8F5C2-65AA-42F0-A20B-6F95B13A9F48}.Release|Any CPU.ActiveCfg = Release|Any CPU {41B8F5C2-65AA-42F0-A20B-6F95B13A9F48}.Release|Any CPU.Build.0 = Release|Any CPU + {41B8F5C2-65AA-42F0-A20B-6F95B13A9F48}.Release|ARM.ActiveCfg = Release|Any CPU + {41B8F5C2-65AA-42F0-A20B-6F95B13A9F48}.Release|ARM.Build.0 = Release|Any CPU + {41B8F5C2-65AA-42F0-A20B-6F95B13A9F48}.Release|x64.ActiveCfg = Release|Any CPU + {41B8F5C2-65AA-42F0-A20B-6F95B13A9F48}.Release|x64.Build.0 = Release|Any CPU + {41B8F5C2-65AA-42F0-A20B-6F95B13A9F48}.Release|x86.ActiveCfg = Release|Any CPU + {41B8F5C2-65AA-42F0-A20B-6F95B13A9F48}.Release|x86.Build.0 = Release|Any CPU {450AC313-BF25-4BFD-A066-9F39F026FDCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {450AC313-BF25-4BFD-A066-9F39F026FDCF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {450AC313-BF25-4BFD-A066-9F39F026FDCF}.Debug|ARM.ActiveCfg = Debug|Any CPU + {450AC313-BF25-4BFD-A066-9F39F026FDCF}.Debug|ARM.Build.0 = Debug|Any CPU + {450AC313-BF25-4BFD-A066-9F39F026FDCF}.Debug|x64.ActiveCfg = Debug|Any CPU + {450AC313-BF25-4BFD-A066-9F39F026FDCF}.Debug|x64.Build.0 = Debug|Any CPU + {450AC313-BF25-4BFD-A066-9F39F026FDCF}.Debug|x86.ActiveCfg = Debug|Any CPU + {450AC313-BF25-4BFD-A066-9F39F026FDCF}.Debug|x86.Build.0 = Debug|Any CPU {450AC313-BF25-4BFD-A066-9F39F026FDCF}.Release|Any CPU.ActiveCfg = Release|Any CPU {450AC313-BF25-4BFD-A066-9F39F026FDCF}.Release|Any CPU.Build.0 = Release|Any CPU + {450AC313-BF25-4BFD-A066-9F39F026FDCF}.Release|ARM.ActiveCfg = Release|Any CPU + {450AC313-BF25-4BFD-A066-9F39F026FDCF}.Release|ARM.Build.0 = Release|Any CPU + {450AC313-BF25-4BFD-A066-9F39F026FDCF}.Release|x64.ActiveCfg = Release|Any CPU + {450AC313-BF25-4BFD-A066-9F39F026FDCF}.Release|x64.Build.0 = Release|Any CPU + {450AC313-BF25-4BFD-A066-9F39F026FDCF}.Release|x86.ActiveCfg = Release|Any CPU + {450AC313-BF25-4BFD-A066-9F39F026FDCF}.Release|x86.Build.0 = Release|Any CPU {0F333344-7695-47B2-B0E6-172E4DE74819}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0F333344-7695-47B2-B0E6-172E4DE74819}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0F333344-7695-47B2-B0E6-172E4DE74819}.Debug|ARM.ActiveCfg = Debug|Any CPU + {0F333344-7695-47B2-B0E6-172E4DE74819}.Debug|ARM.Build.0 = Debug|Any CPU + {0F333344-7695-47B2-B0E6-172E4DE74819}.Debug|x64.ActiveCfg = Debug|Any CPU + {0F333344-7695-47B2-B0E6-172E4DE74819}.Debug|x64.Build.0 = Debug|Any CPU + {0F333344-7695-47B2-B0E6-172E4DE74819}.Debug|x86.ActiveCfg = Debug|Any CPU + {0F333344-7695-47B2-B0E6-172E4DE74819}.Debug|x86.Build.0 = Debug|Any CPU {0F333344-7695-47B2-B0E6-172E4DE74819}.Release|Any CPU.ActiveCfg = Release|Any CPU {0F333344-7695-47B2-B0E6-172E4DE74819}.Release|Any CPU.Build.0 = Release|Any CPU + {0F333344-7695-47B2-B0E6-172E4DE74819}.Release|ARM.ActiveCfg = Release|Any CPU + {0F333344-7695-47B2-B0E6-172E4DE74819}.Release|ARM.Build.0 = Release|Any CPU + {0F333344-7695-47B2-B0E6-172E4DE74819}.Release|x64.ActiveCfg = Release|Any CPU + {0F333344-7695-47B2-B0E6-172E4DE74819}.Release|x64.Build.0 = Release|Any CPU + {0F333344-7695-47B2-B0E6-172E4DE74819}.Release|x86.ActiveCfg = Release|Any CPU + {0F333344-7695-47B2-B0E6-172E4DE74819}.Release|x86.Build.0 = Release|Any CPU {8CB44F28-2956-4C2A-9314-72727262EDD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8CB44F28-2956-4C2A-9314-72727262EDD4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8CB44F28-2956-4C2A-9314-72727262EDD4}.Debug|ARM.ActiveCfg = Debug|Any CPU + {8CB44F28-2956-4C2A-9314-72727262EDD4}.Debug|ARM.Build.0 = Debug|Any CPU + {8CB44F28-2956-4C2A-9314-72727262EDD4}.Debug|x64.ActiveCfg = Debug|Any CPU + {8CB44F28-2956-4C2A-9314-72727262EDD4}.Debug|x64.Build.0 = Debug|Any CPU + {8CB44F28-2956-4C2A-9314-72727262EDD4}.Debug|x86.ActiveCfg = Debug|Any CPU + {8CB44F28-2956-4C2A-9314-72727262EDD4}.Debug|x86.Build.0 = Debug|Any CPU {8CB44F28-2956-4C2A-9314-72727262EDD4}.Release|Any CPU.ActiveCfg = Release|Any CPU {8CB44F28-2956-4C2A-9314-72727262EDD4}.Release|Any CPU.Build.0 = Release|Any CPU + {8CB44F28-2956-4C2A-9314-72727262EDD4}.Release|ARM.ActiveCfg = Release|Any CPU + {8CB44F28-2956-4C2A-9314-72727262EDD4}.Release|ARM.Build.0 = Release|Any CPU + {8CB44F28-2956-4C2A-9314-72727262EDD4}.Release|x64.ActiveCfg = Release|Any CPU + {8CB44F28-2956-4C2A-9314-72727262EDD4}.Release|x64.Build.0 = Release|Any CPU + {8CB44F28-2956-4C2A-9314-72727262EDD4}.Release|x86.ActiveCfg = Release|Any CPU + {8CB44F28-2956-4C2A-9314-72727262EDD4}.Release|x86.Build.0 = Release|Any CPU {1E42A658-45C4-4DD9-83C5-2A10728DBDFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1E42A658-45C4-4DD9-83C5-2A10728DBDFA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1E42A658-45C4-4DD9-83C5-2A10728DBDFA}.Debug|ARM.ActiveCfg = Debug|Any CPU + {1E42A658-45C4-4DD9-83C5-2A10728DBDFA}.Debug|ARM.Build.0 = Debug|Any CPU + {1E42A658-45C4-4DD9-83C5-2A10728DBDFA}.Debug|x64.ActiveCfg = Debug|Any CPU + {1E42A658-45C4-4DD9-83C5-2A10728DBDFA}.Debug|x64.Build.0 = Debug|Any CPU + {1E42A658-45C4-4DD9-83C5-2A10728DBDFA}.Debug|x86.ActiveCfg = Debug|Any CPU + {1E42A658-45C4-4DD9-83C5-2A10728DBDFA}.Debug|x86.Build.0 = Debug|Any CPU {1E42A658-45C4-4DD9-83C5-2A10728DBDFA}.Release|Any CPU.ActiveCfg = Release|Any CPU {1E42A658-45C4-4DD9-83C5-2A10728DBDFA}.Release|Any CPU.Build.0 = Release|Any CPU + {1E42A658-45C4-4DD9-83C5-2A10728DBDFA}.Release|ARM.ActiveCfg = Release|Any CPU + {1E42A658-45C4-4DD9-83C5-2A10728DBDFA}.Release|ARM.Build.0 = Release|Any CPU + {1E42A658-45C4-4DD9-83C5-2A10728DBDFA}.Release|x64.ActiveCfg = Release|Any CPU + {1E42A658-45C4-4DD9-83C5-2A10728DBDFA}.Release|x64.Build.0 = Release|Any CPU + {1E42A658-45C4-4DD9-83C5-2A10728DBDFA}.Release|x86.ActiveCfg = Release|Any CPU + {1E42A658-45C4-4DD9-83C5-2A10728DBDFA}.Release|x86.Build.0 = Release|Any CPU + {3AB98B6E-05DB-44FA-9DAD-584AA88F0739}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3AB98B6E-05DB-44FA-9DAD-584AA88F0739}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3AB98B6E-05DB-44FA-9DAD-584AA88F0739}.Debug|ARM.ActiveCfg = Debug|Any CPU + {3AB98B6E-05DB-44FA-9DAD-584AA88F0739}.Debug|ARM.Build.0 = Debug|Any CPU + {3AB98B6E-05DB-44FA-9DAD-584AA88F0739}.Debug|x64.ActiveCfg = Debug|Any CPU + {3AB98B6E-05DB-44FA-9DAD-584AA88F0739}.Debug|x64.Build.0 = Debug|Any CPU + {3AB98B6E-05DB-44FA-9DAD-584AA88F0739}.Debug|x86.ActiveCfg = Debug|Any CPU + {3AB98B6E-05DB-44FA-9DAD-584AA88F0739}.Debug|x86.Build.0 = Debug|Any CPU + {3AB98B6E-05DB-44FA-9DAD-584AA88F0739}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3AB98B6E-05DB-44FA-9DAD-584AA88F0739}.Release|Any CPU.Build.0 = Release|Any CPU + {3AB98B6E-05DB-44FA-9DAD-584AA88F0739}.Release|ARM.ActiveCfg = Release|Any CPU + {3AB98B6E-05DB-44FA-9DAD-584AA88F0739}.Release|ARM.Build.0 = Release|Any CPU + {3AB98B6E-05DB-44FA-9DAD-584AA88F0739}.Release|x64.ActiveCfg = Release|Any CPU + {3AB98B6E-05DB-44FA-9DAD-584AA88F0739}.Release|x64.Build.0 = Release|Any CPU + {3AB98B6E-05DB-44FA-9DAD-584AA88F0739}.Release|x86.ActiveCfg = Release|Any CPU + {3AB98B6E-05DB-44FA-9DAD-584AA88F0739}.Release|x86.Build.0 = Release|Any CPU + {58CD3B9C-EBBA-4527-A81C-78B7EA9CA298}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {58CD3B9C-EBBA-4527-A81C-78B7EA9CA298}.Debug|Any CPU.Build.0 = Debug|Any CPU + {58CD3B9C-EBBA-4527-A81C-78B7EA9CA298}.Debug|ARM.ActiveCfg = Debug|Any CPU + {58CD3B9C-EBBA-4527-A81C-78B7EA9CA298}.Debug|ARM.Build.0 = Debug|Any CPU + {58CD3B9C-EBBA-4527-A81C-78B7EA9CA298}.Debug|x64.ActiveCfg = Debug|Any CPU + {58CD3B9C-EBBA-4527-A81C-78B7EA9CA298}.Debug|x64.Build.0 = Debug|Any CPU + {58CD3B9C-EBBA-4527-A81C-78B7EA9CA298}.Debug|x86.ActiveCfg = Debug|Any CPU + {58CD3B9C-EBBA-4527-A81C-78B7EA9CA298}.Debug|x86.Build.0 = Debug|Any CPU + {58CD3B9C-EBBA-4527-A81C-78B7EA9CA298}.Release|Any CPU.ActiveCfg = Release|Any CPU + {58CD3B9C-EBBA-4527-A81C-78B7EA9CA298}.Release|Any CPU.Build.0 = Release|Any CPU + {58CD3B9C-EBBA-4527-A81C-78B7EA9CA298}.Release|ARM.ActiveCfg = Release|Any CPU + {58CD3B9C-EBBA-4527-A81C-78B7EA9CA298}.Release|ARM.Build.0 = Release|Any CPU + {58CD3B9C-EBBA-4527-A81C-78B7EA9CA298}.Release|x64.ActiveCfg = Release|Any CPU + {58CD3B9C-EBBA-4527-A81C-78B7EA9CA298}.Release|x64.Build.0 = Release|Any CPU + {58CD3B9C-EBBA-4527-A81C-78B7EA9CA298}.Release|x86.ActiveCfg = Release|Any CPU + {58CD3B9C-EBBA-4527-A81C-78B7EA9CA298}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Filtration/Translators/ItemFilterBlockTranslator.cs b/Filtration/Translators/ItemFilterBlockTranslator.cs index c51dc8f..4a99007 100644 --- a/Filtration/Translators/ItemFilterBlockTranslator.cs +++ b/Filtration/Translators/ItemFilterBlockTranslator.cs @@ -254,7 +254,7 @@ namespace Filtration.Translators private static void SetNumericFilterPredicateFromString(NumericFilterPredicate predicate, string inputString) { - var result = Regex.Match(inputString, @"^\w+\s+([><=]{0,2})\s*(\d{0,3})$"); if (result.Groups.Count != 3) return; predicate.PredicateOperator =