mikx/Filtration
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

FIL-4 Refactored script parsing to retain isolated comments as a new ItemFilterBlockComment type - UI still needs reworking with new templates and such.

Browse Source
This commit is contained in:
Ben Wallis
2017-05-20 18:14:28 +01:00
parent 797c911bb5
commit 4def27c49d
18 changed files with 273 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Filtration/ViewModels/ItemFilterBlockViewModel.cs
View File

@@ -4,7 +4,6 @@ using System.Collections.ObjectModel;
using System.Collections.Specialized;
using System.Linq;
using System.Windows.Media;
using Filtration.Common.ViewModels;
using Filtration.ObjectModel;
using Filtration.ObjectModel.BlockItemBaseTypes;
using Filtration.ObjectModel.BlockItemTypes;

4
Filtration/ViewModels/ItemFilterScriptViewModel.cs
View File

@@ -320,7 +320,7 @@ namespace Filtration.ViewModels
ItemFilterBlockViewModels.Clear();
Script = itemFilterScript;
foreach (var block in Script.ItemFilterBlocks)
foreach (var block in Script.ItemFilterBlocks.OfType<ItemFilterBlock>())
{
var vm = _itemFilterBlockViewModelFactory.Create();
vm.Initialise(block, this);
@@ -426,7 +426,7 @@ namespace Filtration.ViewModels
var unusedThemeComponents =
Script.ThemeComponents.Where(
t =>
Script.ItemFilterBlocks.Count(
Script.ItemFilterBlocks.OfType<ItemFilterBlock>().Count(
b => b.BlockItems.OfType<ColorBlockItem>().Count(i => i.ThemeComponent == t) > 0) == 0).ToList();
if (unusedThemeComponents.Count <= 0) return true;