Add grid filtering and owner block count display.

- Introduced filter functionality for grids, allowing dynamic filtering by name.
- Updated SortedView to allow filter function.
- Added owner block count tracking and display per grid.
- Updated UI elements to show grid block count and owner details.

Author: buttheadbob

Torch.Server/ViewModels/Entities/EntityViewModel.cs

@@ -1,20 +1,11 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
 using NLog;
-using Sandbox.Game;
 using Sandbox.Game.Entities;
-using Sandbox.Game.Entities.Character;
-using Sandbox.Game.Entities.Cube;
-using Sandbox.Game.World;
 using Torch.API.Managers;
 using Torch.Collections;
 using Torch.Server.Managers;
 using Torch.Utils;
-using VRage.Game.Entity;
-using VRage.Game.ModAPI;
 using VRage.ModAPI;
 using VRageMath;
 

Torch.Server/ViewModels/Entities/GridViewModel.cs

@@ -1,12 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.CompilerServices;
 using Sandbox.Definitions;
 using Sandbox.Game.Entities;
 using Sandbox.Game.Entities.Cube;
-using Sandbox.ModAPI;
-using Torch.API.Managers;
+using Sandbox.Game.World;
 using Torch.Collections;
 using Torch.Server.ViewModels.Blocks;
 using VRage.Game;
@@ -50,18 +48,19 @@ public MtObservableSortedDictionary<MyCubeBlockDefinition, MtObservableSortedDic
             Blocks { get; } =
             new MtObservableSortedDictionary<MyCubeBlockDefinition, MtObservableSortedDictionary<long, BlockViewModel>>(
                 CubeBlockDefinitionComparer.Default);
-        
+
         public GridViewModel()
         {
+            
         }
-        
+
         public GridViewModel(MyCubeGrid grid, EntityTreeViewModel tree) : base(grid, tree)
         {
             //DescriptiveName = $"{grid.DisplayName} ({grid.BlocksCount} blocks)";
             Blocks.Add(_fillerDefinition, new MtObservableSortedDictionary<long, BlockViewModel>());
         }
 
-        private void Grid_OnBlockRemoved(Sandbox.Game.Entities.Cube.MySlimBlock obj)
+        private void Grid_OnBlockRemoved(MySlimBlock obj)
         {
             if (obj.FatBlock != null)
                 RemoveBlock(obj.FatBlock);
@@ -75,16 +74,62 @@ private void RemoveBlock(MyCubeBlock block)
                 return;
             if (group.Remove(block.EntityId) && group.Count == 0 && Blocks.Count > 1)
                 Blocks.Remove(block.BlockDefinition);
+            
+            long ownerId = block.OwnerId;
+            if (block.OwnerId == 0)
+                ownerId = block.IDModule.Owner;
+
+            if (ownerId != 0)
+            {
+                var playerIdent = MySession.Static.Players.TryGetIdentity(ownerId);
+                if (playerIdent != null)
+                {
+                    var name = playerIdent.DisplayName;
+                    if (Owners.ContainsKey(name))
+                        Owners[name]--;
+                    if (Owners[name] == 0)
+                        Owners.Remove(name);
+                }
+            }
         }
 
         private void AddBlock(MyTerminalBlock block)
         {
             if (!Blocks.TryGetValue(block.BlockDefinition, out var group))
                 group = Blocks[block.BlockDefinition] = new MtObservableSortedDictionary<long, BlockViewModel>();
             group.Add(block.EntityId, new BlockViewModel(block, Tree));
+
+            long ownerId = block.OwnerId;
+            if (block.OwnerId == 0)
+                ownerId = block.IDModule.Owner;
+
+            if (ownerId != 0)
+            {
+                var playerIdent = MySession.Static.Players.TryGetIdentity(ownerId);
+                if (playerIdent != null)
+                {
+                    var name = playerIdent.DisplayName;
+                    if (!Owners.TryGetValue(name, out int count))
+                        Owners[name] = 1;
+                    else
+                        Owners[name] = count + 1; 
+                }
+            }
+        }
+        
+        public int BlockCount
+        {
+            get
+            {
+                if (Grid != null)
+                    return Grid.BlocksCount;
+                return 0;
+            }
         }
 
-        private void Grid_OnBlockAdded(Sandbox.Game.Entities.Cube.MySlimBlock obj)
+        public MtObservableSortedDictionary<string,int> Owners { get; } = new MtObservableSortedDictionary<string, int>();
+
+        private void Grid_OnBlockAdded(MySlimBlock obj)
         {
             var block = obj.FatBlock as MyTerminalBlock;
             if (block != null)

Torch.Server/ViewModels/EntityTreeViewModel.cs

@@ -37,6 +37,7 @@ public enum SortEnum
         public Dispatcher ControlDispatcher => _control.Dispatcher;
 
         public SortedView<GridViewModel> SortedGrids { get; }
+        public SortedView<GridViewModel> FilteredSortedGrids { get; }
         public SortedView<CharacterViewModel> SortedCharacters { get; }
         public SortedView<FloatingObjectViewModel> SortedFloatingObjects { get; }
         public SortedView<VoxelMapViewModel> SortedVoxelMaps { get; }
@@ -67,6 +68,7 @@ public EntityTreeViewModel(UserControl control)
             _control = control;
             var comparer = new EntityViewModel.Comparer(_currentSort);
             SortedGrids = new SortedView<GridViewModel>(Grids.Values, comparer);
+            FilteredSortedGrids = new SortedView<GridViewModel>(Grids.Values, comparer);
             SortedCharacters = new SortedView<CharacterViewModel>(Characters.Values, comparer);
             SortedFloatingObjects = new SortedView<FloatingObjectViewModel>(FloatingObjects.Values, comparer);
             SortedVoxelMaps = new SortedView<VoxelMapViewModel>(VoxelMaps.Values, comparer);

Torch.Server/Views/Entities/GridView.xaml

@@ -22,29 +22,44 @@
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
         <StackPanel Grid.Row="0" Orientation="Horizontal">
+            <Button Content="Repair" Margin="3" Width="125" Tag="{Binding ElementName=EntityIDText, Path=Text}" Click="RepairGrid"/>
+        </StackPanel>
+        <StackPanel Grid.Row="1" Orientation="Horizontal">
             <Label Content="Name" Width="125"/>
             <TextBox Text="{Binding Name}" Margin="3"/>
         </StackPanel>
-        <StackPanel Grid.Row="1" Orientation="Horizontal">
+        <StackPanel Grid.Row="2" Orientation="Horizontal">
             <Label Content="Position" Width="125"/>
             <TextBox Text="{Binding Position}" Margin="3" />
         </StackPanel>
-        <StackPanel Grid.Row="2" Orientation="Horizontal">
+        <StackPanel Grid.Row="3" Orientation="Horizontal">
             <Label Content="EntityID" Width="125"/>
             <TextBox x:Name="EntityIDText" Text="{Binding Id, Mode=OneWay}" Margin="3" />
         </StackPanel>
-        <StackPanel Grid.Row="3" Orientation="Horizontal">
+        <StackPanel Grid.Row="4" Orientation="Horizontal">
             <Label Content="Speed" Width="125" />
             <TextBox Text="{Binding Speed, Mode=OneWay}" Margin="3" />
         </StackPanel>
-        <StackPanel Grid.Row="4" Orientation="Horizontal">
+        <StackPanel Grid.Row="5" Orientation="Horizontal">
             <Label Content="Distance From Center" Width="125" />
             <TextBox Text="{Binding PrettyDistance, Mode=OneWay}" Margin="3" />
         </StackPanel>
-        <StackPanel Grid.Row="5" Orientation="Horizontal">
-            <Button Content="Repair" Margin="3" Width="125" Tag="{Binding ElementName=EntityIDText, Path=Text}" Click="RepairGrid"/>
+        <StackPanel Grid.Row="6" Orientation="Horizontal">
+            <Label Content="Blocks" Width="125" />
+            <TextBox Text="{Binding BlockCount, Mode=OneWay}" Margin="3" />
+        </StackPanel>
+        <StackPanel Grid.Row="7" Grid.ColumnSpan="2" Orientation="Horizontal">
+            <TextBlock Text="Owners and Blocks" Width="125" ToolTip="Expand the blocklist on the grid entry to populate."/>
+            
+            <DataGrid x:Name="DictGrid" AutoGenerateColumns="False" CanUserAddRows="False" 
+                      IsReadOnly="True" ItemsSource="{Binding Owners}" 
+                      Margin="3" ToolTip="Expand the blocklist on the grid entry to populate.">
+                <DataGrid.Columns>
+                    <DataGridTextColumn Header="Name" Binding="{Binding Key, Mode=OneWay}"/>
+                    <DataGridTextColumn Header="Count" Binding="{Binding Value, Mode=OneWay}"/>
+                </DataGrid.Columns>
+            </DataGrid>
         </StackPanel>
-        
 
         <ScrollViewer Grid.Row="6" Margin="3" VerticalScrollBarVisibility="Auto">
             <local:EntityControlsView DataContext="{Binding}"/>

Torch.Server/Views/EntitiesControl.xaml

@@ -99,19 +99,26 @@
             </Grid>
         </TabItem>
 
-        <TabItem Header="Grids">
+        <TabItem Header="Grids" IsSelected="True">
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="5*"/>
                     <ColumnDefinition Width="5*"/>
                 </Grid.ColumnDefinitions>
                 <Grid Grid.Column="0">
                     <Grid.RowDefinitions>
-                        <RowDefinition />
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="*" />
+                        <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
-                    <TreeView Grid.Row="0" Grid.Column="0" Margin="3" DockPanel.Dock="Top" 
+                    <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Center">
+                        <TextBlock Text="Filter" Margin="3"/>
+                        <TextBox Name="FilterBox" ToolTip="Filter" MinWidth="150"/>
+                    </StackPanel>
+                    
+                    <TreeView Grid.Row="1" Grid.Column="0" Margin="3" DockPanel.Dock="Top" 
                               SelectedItemChanged="TreeView_Grids_OnSelectionItemChanged" 
                               TreeViewItem.Expanded="TreeViewItem_OnExpanded" Name="EntityTree_Grids">
                         <TreeView.Resources>
@@ -138,15 +145,15 @@
                             </HierarchicalDataTemplate>
                         </TreeView.Resources>
 
-                        <TreeViewItem ItemsSource="{Binding Path=SortedGrids}">
+                        <TreeViewItem ItemsSource="{Binding Path=FilteredSortedGrids}">
                             <TreeViewItem.Header>
-                                <TextBlock Text="{Binding Grids.Count, StringFormat=Grids ({0})}" />
+                                <TextBlock Text="{Binding FilteredSortedGrids.FilteredCount, StringFormat=Grids ({0})}" />
                             </TreeViewItem.Header>
                         </TreeViewItem>
                     </TreeView>
 
-                    <ComboBox Grid.Row="1" Margin="3" Name="SortCombo_GridTab" SelectionChanged="SortCombo_SelectionChanged" />
-                    <StackPanel Grid.Column="0" Grid.Row="2" DockPanel.Dock="Bottom">
+                    <ComboBox Grid.Row="2" Margin="3" Name="SortCombo_GridTab" SelectionChanged="SortCombo_SelectionChanged" />
+                    <StackPanel Grid.Column="0" Grid.Row="3" DockPanel.Dock="Bottom">
                         <Button Tag="Grids" Content="Delete Selected" Click="MultiDelete_OnClick" IsEnabled="{Binding CurrentEntity.CanDelete}" Margin="3" />
                         <Button Content="Stop" Click="Stop_OnClick" IsEnabled="{Binding CurrentEntity.CanStop}" Margin="3" />
                     </StackPanel>

Torch.Server/Views/EntitiesControl.xaml.cs

@@ -45,6 +45,12 @@ public EntitiesControl()
             SortCombo_Characters.ItemsSource = Enum.GetNames(typeof(EntityTreeViewModel.SortEnum));
             SortCombo_Voxels.ItemsSource = Enum.GetNames(typeof(EntityTreeViewModel.SortEnum));
             SortCombo_FloatingObjects.ItemsSource = Enum.GetNames(typeof(EntityTreeViewModel.SortEnum));
+
+            FilterBox.TextChanged += (sender, args) =>
+            {
+                string filter = FilterBox.Text;
+                Entities.FilteredSortedGrids.Filter = grid => grid.Name.Contains(filter, StringComparison.OrdinalIgnoreCase);
+            };
         }
 
         private void TreeView_OnSelectedItemChanged(object sender, RoutedPropertyChangedEventArgs<object> e)

Torch/Collections/SortedView.cs

@@ -3,12 +3,7 @@
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
-using System.Linq;
 using System.Runtime.CompilerServices;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Havok;
 using NLog;
 
 namespace Torch.Collections
@@ -19,6 +14,7 @@ public class SortedView<T>: IReadOnlyCollection<T>, INotifyCollectionChanged, IN
         private readonly MtObservableCollectionBase<T> _backing;
         private IComparer<T> _comparer;
         private readonly List<T> _store;
+        private Predicate<T> _filter;
 
         public SortedView(MtObservableCollectionBase<T> backing, IComparer<T> comparer)
         {
@@ -55,7 +51,6 @@ private void backing_CollectionChanged(object sender, NotifyCollectionChangedEve
                 default:
                     throw new ArgumentOutOfRangeException();
             }
-
         }
 
         public IEnumerator<T> GetEnumerator()
@@ -70,6 +65,16 @@ IEnumerator IEnumerable.GetEnumerator()
 
         public int Count => _backing.Count;
 
+        public int FilteredCount
+        {
+            get
+            {
+                if (_filter == null)
+                    return Count;
+                return _store.Count;
+            }
+        }
+
         private void InsertSorted(IEnumerable items)
         {
             foreach (var t in items)
@@ -100,6 +105,8 @@ private int InsertSorted(T item, IComparer<T> comparer = null)
             if (index < 0)
                 index = ~index;
             _store.Insert(index, item);
+            OnPropertyChanged(nameof(Count));
+            OnPropertyChanged(nameof(FilteredCount));
             return index;
         }
 
@@ -115,15 +122,31 @@ public void Sort(IComparer<T> comparer = null)
 
             CollectionChanged?.Invoke(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
         }
+        
+        public Predicate<T> Filter
+        {
+            get => _filter;
+            set
+            {
+                _filter = value;
+                Refresh();
+            }
+        }
 
         public void Refresh()
         {
             _store.Clear();
             //_store.AddRange(_backing);
             _store.EnsureCapacity(_backing.Count);
-            foreach (var e in _backing)
-                _store.Add(e);
-            Sort();
+            foreach (var item in _backing)
+            {
+                if (_filter == null || _filter(item))
+                    _store.Add(item);
+            }
+            Sort(); // maintain sort
+            CollectionChanged?.Invoke(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
+            OnPropertyChanged(nameof(Count));
+            OnPropertyChanged(nameof(FilteredCount));
         }
 
         public void SetComparer(IComparer<T> comparer, bool resort = true)