提交: 449ccebc82a489b7fe2561d7592637bddb52f021 - KancolleSniffer (git)

Commit MetaInfo

• 修订版: 449ccebc82a489b7fe2561d7592637bddb52f021 (tree)
• 时间: 2020-09-16 19:30:12
• 作者: Kazuhiro Fujieda <fujieda@user...>
• Commiter: Kazuhiro Fujieda

Log Message

一覧の艦娘の分類をセカンダリに反映させるのに再起動が必要なのを直す

更改概述

• modified: KancolleSniffer/Forms/ListForm.cs
• modified: KancolleSniffer/View/ShipListPanel/GroupConfigLabels.cs
• modified: KancolleSniffer/View/ShipListPanel/ShipListPanel.cs

差异

--- a/KancolleSniffer/Forms/ListForm.cs
+++ b/KancolleSniffer/Forms/ListForm.cs
@@ -103,7 +103,48 @@ namespace KancolleSniffer.Forms
                 shipListPanel.ToggleHpPercent();
                 battleResultPanel.ToggleHpPercent();
             }
-            LoadShipGroupFromConfig();
+        }
+
+        private ShipListConfig GetConfig()
+        {
+            if (_isMaster)
+            {
+                SetGroup();
+                return _config.ShipList;
+            }
+            if (_config.ListFormGroup.Count == 0)
+                return CreateSecondaryConfig();
+            var config = _config.ListFormGroup[0];
+            _config.ListFormGroup.RemoveAt(0);
+            config.ShipGroup = _config.ShipList.ShipGroup;
+            return config;
+        }
+
+        private ShipListConfig CreateSecondaryConfig()
+        {
+            var src = _config.ShipList;
+            var config = new ShipListConfig
+            {
+                Mode = src.Mode,
+                ShipCategories = src.ShipCategories,
+                ShipType = src.ShipType,
+                ShowHpInPercent = src.ShowHpInPercent,
+                SortOrder = src.SortOrder,
+                Location = src.Location,
+                Size = src.Size,
+                ShipGroup = src.ShipGroup
+            };
+            if (config.Mode == "分類" || string.IsNullOrEmpty(config.Mode))
+                config.Mode = "全艦";
+            return config;
+        }
+
+        private void SetGroup()
+        {
+            var groups = _config.ShipList.ShipGroup;
+            for (var i = groups.Count; i < GroupConfigLabels.GroupCount; i++)
+                groups.Add(new List<int>());
+            shipListPanel.GroupSettings = groups;
         }
 
         public void UpdateList()
@@ -135,12 +176,25 @@ namespace KancolleSniffer.Forms
             }
             if (shipListPanel.GroupUpdated)
             {
-                StoreShipGroupToConfig();
+                PurifyShipGroup();
                 _config.Save();
                 shipListPanel.GroupUpdated = false;
             }
         }
 
+        private void PurifyShipGroup()
+        {
+            var all = _sniffer.ShipList.Select(s => s.Id).ToArray();
+            if (all.Length == 0)
+                return;
+            foreach (var g in _config.ShipList.ShipGroup)
+            {
+                var filtered = g.Intersect(all).ToArray();
+                g.Clear();
+                g.AddRange(filtered);
+            }
+        }
+
         private void SetHeaderVisibility()
         {
             static void Set(Control header, bool visible)
@@ -287,43 +341,8 @@ namespace KancolleSniffer.Forms
 
         private void SetMinimumSize()
         {
-            MinimumSize = new Size(Width - Scaler.ScaleWidth(24) - SystemInformation.VerticalScrollBarWidth * (_config.Zoom - 100) / 100, 0);
-        }
-
-        private ShipListConfig GetConfig()
-        {
-            if (_isMaster)
-                return _config.ShipList;
-            if (_config.ListFormGroup.Count == 0)
-                return CreateSecondaryConfig();
-            var config = _config.ListFormGroup[0];
-            _config.ListFormGroup.RemoveAt(0);
-            return config;
-        }
-
-        private ShipListConfig CreateSecondaryConfig()
-        {
-            var src = _config.ShipList;
-            var config = new ShipListConfig
-            {
-                Mode = src.Mode,
-                ShipCategories = src.ShipCategories,
-                ShipType = src.ShipType,
-                ShowHpInPercent = src.ShowHpInPercent,
-                SortOrder = src.SortOrder,
-                Location = src.Location,
-                Size = src.Size
-            };
-            if (config.Mode == "分類" || string.IsNullOrEmpty(config.Mode))
-                config.Mode = "全艦";
-            return config;
-        }
-
-        private void LoadShipGroupFromConfig()
-        {
-            var group = _config.ShipList.ShipGroup;
-            for (var i = 0; i < GroupConfigLabels.GroupCount; i++)
-                shipListPanel.GroupSettings[i] = i < group.Count ? new HashSet<int>(group[i]) : new HashSet<int>();
+            MinimumSize = new Size(Width - Scaler.ScaleWidth(24) -
+                                   SystemInformation.VerticalScrollBarWidth * (_config.Zoom - 100) / 100, 0);
         }
 
         private void SetCheckBoxSTypeState()
@@ -354,7 +373,7 @@ namespace KancolleSniffer.Forms
 
         private void SaveMasterState()
         {
-            StoreShipGroupToConfig();
+            PurifyShipGroup();
             _listConfig.Visible = Visible && WindowState == FormWindowState.Normal;
             SaveBounds(_listConfig); // 最小化時は以前のサイズを記録する
         }
@@ -366,6 +385,7 @@ namespace KancolleSniffer.Forms
             if (WindowState != FormWindowState.Normal) // 最小化時は次回復旧しない
                 return;
             _listConfig.Visible = true;
+            _listConfig.ShipGroup = null;
             _config.ListFormGroup.Add(_listConfig);
             SaveBounds(_listConfig);
         }
@@ -419,19 +439,6 @@ namespace KancolleSniffer.Forms
             Owner = null;
         }
 
-        private void StoreShipGroupToConfig()
-        {
-            var all = _sniffer.ShipList.Select(s => s.Id).ToArray();
-            var group = _config.ShipList.ShipGroup;
-            group.Clear();
-            for (var i = 0; i < GroupConfigLabels.GroupCount; i++)
-            {
-                if (all.Length > 0)
-                    shipListPanel.GroupSettings[i].IntersectWith(all);
-                group.Add(shipListPanel.GroupSettings[i].ToList());
-            }
-        }
-
         public void ShowShip(int id)
         {
             if (!Visible)
@@ -627,7 +634,8 @@ namespace KancolleSniffer.Forms
 
         private void ListForm_ResizeEnd(object sender, EventArgs e)
         {
-            foreach (var panel in new IPanelResize[] {shipListPanel, antiAirPanel, airBattleResultPanel, battleResultPanel, fleetPanel})
+            foreach (var panel in new IPanelResize[]
+                {shipListPanel, antiAirPanel, airBattleResultPanel, battleResultPanel, fleetPanel})
             {
                 if (panel.Visible)
                     panel.ApplyResize();

--- a/KancolleSniffer/View/ShipListPanel/GroupConfigLabels.cs
+++ b/KancolleSniffer/View/ShipListPanel/GroupConfigLabels.cs
@@ -18,7 +18,6 @@ using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
 using KancolleSniffer.Forms;
-using KancolleSniffer.Model;
 
 // ReSharper disable CoVariantArrayConversion
 
@@ -31,7 +30,7 @@ namespace KancolleSniffer.View.ShipListPanel
         private readonly List<ShipLabels> _labelList = new List<ShipLabels>();
 
         public const int GroupCount = 4;
-        public HashSet<int>[] GroupSettings { get; } = new HashSet<int>[GroupCount];
+        public List<List<int>> GroupSettings { get; set; }
         public bool GroupUpdated { get; set; }
 
         public GroupConfigLabels(ShipListPanel shipListPanel)
@@ -123,13 +122,5 @@ namespace KancolleSniffer.View.ShipListPanel
         {
             _labelList[i].BackPanel.Visible = false;
         }
-
-        public IEnumerable<ShipStatus> FilterByGroup(IEnumerable<ShipStatus> ships, string group)
-        {
-            var g = Array.FindIndex(new[] {"A", "B", "C", "D"}, x => x == group);
-            if (g == -1)
-                return ships;
-            return from s in ships where GroupSettings[g].Contains(s.Id) select s;
-        }
     }
 }
\ No newline at end of file

--- a/KancolleSniffer/View/ShipListPanel/ShipListPanel.cs
+++ b/KancolleSniffer/View/ShipListPanel/ShipListPanel.cs
@@ -37,7 +37,12 @@ namespace KancolleSniffer.View.ShipListPanel
         private string _mode;
         private bool _hpPercent;
 
-        public HashSet<int>[] GroupSettings => _groupConfigLabels.GroupSettings;
+        public List<List<int>> GroupSettings
+        {
+            get => _groupConfigLabels.GroupSettings;
+            set => _groupConfigLabels.GroupSettings = value;
+        }
+
 
         public bool GroupUpdated
         {
@@ -118,7 +123,7 @@ namespace KancolleSniffer.View.ShipListPanel
         private void CreateShipList(Sniffer sniffer, ShipListConfig settings)
         {
             var ships = FilterByShipTypes(
-                _mode == "修復" ? sniffer.RepairList : _groupConfigLabels.FilterByGroup(sniffer.ShipList, _mode),
+                _mode == "修復" ? sniffer.RepairList : FilterByGroup(sniffer.ShipList, settings.ShipGroup, _mode),
                 settings.ShipCategories).ToArray();
             var order = _mode == "修復" ? ListForm.SortOrder.Repair : settings.SortOrder;
             if (!settings.ShipType)
@@ -134,6 +139,17 @@ namespace KancolleSniffer.View.ShipListPanel
                 }).Concat(ships).OrderBy(ship => ship, new CompareShip(true, order)).ToArray();
         }
 
+        private static IEnumerable<ShipStatus> FilterByGroup(IEnumerable<ShipStatus> ships,
+            IReadOnlyList<List<int>> groups, string groupName)
+        {
+            var g = Array.FindIndex(new[] {"A", "B", "C", "D"}, x => x == groupName);
+            if (g == -1)
+                return ships;
+            if (groups.Count == 0)
+                return new ShipStatus[0];
+            return from s in ships where groups[g].Contains(s.Id) select s;
+        }
+
         private static readonly int[][] ShipTypeIds =
         {
             new[] // 戦艦