OSDN Git Service

艦隊情報関連のコードのリネーム
authorKazuhiro Fujieda <fujieda@users.osdn.me>
Fri, 16 Dec 2016 13:15:41 +0000 (22:15 +0900)
committerKazuhiro Fujieda <fujieda@users.osdn.me>
Sun, 18 Dec 2016 11:37:08 +0000 (20:37 +0900)
KancolleSniffer/FleetPanel.cs
KancolleSniffer/ListForm.Designer.cs
KancolleSniffer/ListForm.cs

index e213fb7..8711d46 100644 (file)
@@ -24,12 +24,12 @@ namespace KancolleSniffer
     {\r
         private const int LineHeight = 14;\r
         private const int LabelHeight = 12;\r
-        private EquipColumn[] _equipList;\r
+        private Record[] _table;\r
         private readonly List<ShipLabel[]> _labelList = new List<ShipLabel[]>();\r
         private readonly List<Panel> _panelList = new List<Panel>();\r
         private readonly ToolTip _toolTip = new ToolTip {ShowAlways = true};\r
 \r
-        private class EquipColumn\r
+        private class Record\r
         {\r
             public string Fleet { get; set; }\r
             public string Fleet2 { get; set; }\r
@@ -41,25 +41,25 @@ namespace KancolleSniffer
             public string Spec2 { get; set; }\r
             public string AircraftSpec { get; set; }\r
 \r
-            public EquipColumn()\r
+            public Record()\r
             {\r
                 Fleet = Ship = Equip = AircraftSpec = "";\r
                 Color = DefaultBackColor;\r
             }\r
         }\r
 \r
-        public void UpdateEquip(Sniffer sniffer)\r
+        public void Update(Sniffer sniffer)\r
         {\r
-            CreateEquipList(sniffer);\r
+            CreateTable(sniffer);\r
             SuspendLayout();\r
-            CreateEquipLabels();\r
-            SetEquipLabels();\r
+            CreateLabels();\r
+            SetRecords();\r
             ResumeLayout();\r
         }\r
 \r
-        private void CreateEquipList(Sniffer sniffer)\r
+        private void CreateTable(Sniffer sniffer)\r
         {\r
-            var list = new List<EquipColumn>();\r
+            var list = new List<Record>();\r
             var fn = new[] {"第一艦隊", "第二艦隊", "第三艦隊", "第四艦隊"};\r
             var tp = 0.0;\r
             for (var f = 0; f < fn.Length; f++)\r
@@ -67,11 +67,11 @@ namespace KancolleSniffer
                 var drumTotal = 0;\r
                 var drumShips = 0;\r
                 var levelTotal = 0;\r
-                var ships = new List<EquipColumn>();\r
+                var ships = new List<Record>();\r
                 foreach (var s in sniffer.GetShipStatuses(f))\r
                 {\r
                     var drum = 0;\r
-                    var equips = new List<EquipColumn>();\r
+                    var equips = new List<Record>();\r
                     for (var i = 0; i < s.Slot.Length; i++)\r
                     {\r
                         var item = s.Slot[i];\r
@@ -91,7 +91,7 @@ namespace KancolleSniffer
                             var normal = 25 + item.Spec.Torpedo * Math.Sqrt(onslot);\r
                             airspec = "航空戦 " + (int)(normal * 0.8) + "/" + (int)(normal * 1.5);\r
                         }\r
-                        equips.Add(new EquipColumn\r
+                        equips.Add(new Record\r
                         {\r
                             Equip = GenEquipString(item, onslot, max),\r
                             AircraftSpec = airspec,\r
@@ -101,7 +101,7 @@ namespace KancolleSniffer
                     if (s.SlotEx.Id > 0)\r
                     {\r
                         var item = s.SlotEx;\r
-                        equips.Add(new EquipColumn {Equip = item.Spec.Name, Color = item.Spec.Color});\r
+                        equips.Add(new Record {Equip = item.Spec.Name, Color = item.Spec.Color});\r
                     }\r
                     if (drum != 0)\r
                         drumShips++;\r
@@ -113,7 +113,7 @@ namespace KancolleSniffer
                     var subm = s.RealAntiSubmarine;\r
                     var torp = s.RealTorpedo;\r
                     var night = s.NightBattlePower;\r
-                    var ship = new EquipColumn\r
+                    var ship = new Record\r
                     {\r
                         Ship = (s.Escaped ? "[避]" : "") + s.Name + " Lv" + s.Level,\r
                         Id = s.Id,\r
@@ -130,7 +130,7 @@ namespace KancolleSniffer
                     ships.Add(ship);\r
                     ships.AddRange(equips);\r
                 }\r
-                list.Add(new EquipColumn\r
+                list.Add(new Record\r
                 {\r
                     Fleet = fn[f] + (levelTotal == 0 ? "" : " 合計Lv" + levelTotal) +\r
                             (drumTotal == 0 ? "" : " ドラム缶" + drumTotal + "(" + drumShips + "隻)")\r
@@ -143,20 +143,20 @@ namespace KancolleSniffer
                 var name = new[] {"第一", "第二", "第三"};\r
                 foreach (var baseInfo in sniffer.BaseAirCorps)\r
                 {\r
-                    list.Add(new EquipColumn {Fleet = baseInfo.AreaName + " 基地航空隊"});\r
+                    list.Add(new Record {Fleet = baseInfo.AreaName + " 基地航空隊"});\r
                     var i = 0;\r
                     foreach (var airCorps in baseInfo.AirCorps)\r
                     {\r
                         if (i >= name.Length)\r
                             break;\r
                         var fp = airCorps.FighterPower;\r
-                        list.Add(new EquipColumn\r
+                        list.Add(new Record\r
                         {\r
                             Ship = name[i++] + " " + airCorps.ActionName,\r
                             Spec = "制空" + (fp[0] == fp[1] ? fp[0].ToString() : fp[0] + "~" + fp[1]) +\r
                                    " 距離" + airCorps.Distance\r
                         });\r
-                        list.AddRange(airCorps.Planes.Select(plane => new EquipColumn\r
+                        list.AddRange(airCorps.Planes.Select(plane => new Record\r
                         {\r
                             Equip =\r
                                 plane.State != 1\r
@@ -167,7 +167,7 @@ namespace KancolleSniffer
                     }\r
                 }\r
             }\r
-            _equipList = list.ToArray();\r
+            _table = list.ToArray();\r
         }\r
 \r
         private string GenEquipString(ItemStatus item, int onslot, int max)\r
@@ -193,13 +193,13 @@ namespace KancolleSniffer
             return truncated + attr;\r
         }\r
 \r
-        private void CreateEquipLabels()\r
+        private void CreateLabels()\r
         {\r
-            for (var i = _labelList.Count; i < _equipList.Length; i++)\r
-                CreateEquipLabels(i);\r
+            for (var i = _labelList.Count; i < _table.Length; i++)\r
+                CreateLabels(i);\r
         }\r
 \r
-        private void CreateEquipLabels(int i)\r
+        private void CreateLabels(int i)\r
         {\r
             var y = 1 + LineHeight * i;\r
             var lbp = new Panel\r
@@ -232,20 +232,20 @@ namespace KancolleSniffer
             }\r
         }\r
 \r
-        private void SetEquipLabels()\r
+        private void SetRecords()\r
         {\r
-            for (var i = 0; i < _equipList.Length; i++)\r
-                SetEquip(i);\r
-            for (var i = _equipList.Length; i < _labelList.Count; i++)\r
+            for (var i = 0; i < _table.Length; i++)\r
+                SetRecord(i);\r
+            for (var i = _table.Length; i < _labelList.Count; i++)\r
                 _panelList[i].Visible = false;\r
         }\r
 \r
-        private void SetEquip(int i)\r
+        private void SetRecord(int i)\r
         {\r
             var lbp = _panelList[i];\r
             if (!lbp.Visible)\r
                 lbp.Location = new Point(lbp.Left, (int)lbp.Tag + AutoScrollPosition.Y);\r
-            var e = _equipList[i];\r
+            var e = _table[i];\r
             var labels = _labelList[i];\r
             labels[0].Text = e.Fleet;\r
             labels[1].SetName(e.Ship);\r
@@ -262,7 +262,7 @@ namespace KancolleSniffer
 \r
         public void ShowShip(int id)\r
         {\r
-            var i = Array.FindIndex(_equipList, e => e.Id == id);\r
+            var i = Array.FindIndex(_table, e => e.Id == id);\r
             if (i == -1)\r
                 return;\r
             var y = (int)Math.Round(ShipLabel.ScaleFactor.Height * LineHeight * i);\r
index 4423781..6e202b0 100644 (file)
@@ -72,7 +72,7 @@ namespace KancolleSniffer
             this.contextMenuStripFleetData = new System.Windows.Forms.ContextMenuStrip(this.components);\r
             this.textToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
             this.deckBuilderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.equipPanel = new KancolleSniffer.FleetPanel();\r
+            this.fleetPanel = new KancolleSniffer.FleetPanel();\r
             this.itemTreeView = new KancolleSniffer.ItemTreeView();\r
             this.contextMenuStripShipList.SuspendLayout();\r
             this.contextMenuStrip.SuspendLayout();\r
@@ -348,17 +348,17 @@ namespace KancolleSniffer
             this.deckBuilderToolStripMenuItem.Text = "デッキビルダー形式でコピー(&D)";\r
             this.deckBuilderToolStripMenuItem.Click += new System.EventHandler(this.deckBuilderToolStripMenuItem_Click);\r
             // \r
-            // equipPanel\r
+            // fleetPanel\r
             // \r
-            this.equipPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) \r
+            this.fleetPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) \r
             | System.Windows.Forms.AnchorStyles.Left)));\r
-            this.equipPanel.AutoScroll = true;\r
-            this.equipPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
-            this.equipPanel.ContextMenuStrip = this.contextMenuStripFleetData;\r
-            this.equipPanel.Location = new System.Drawing.Point(6, 23);\r
-            this.equipPanel.Name = "equipPanel";\r
-            this.equipPanel.Size = new System.Drawing.Size(238, 263);\r
-            this.equipPanel.TabIndex = 1;\r
+            this.fleetPanel.AutoScroll = true;\r
+            this.fleetPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
+            this.fleetPanel.ContextMenuStrip = this.contextMenuStripFleetData;\r
+            this.fleetPanel.Location = new System.Drawing.Point(6, 23);\r
+            this.fleetPanel.Name = "fleetPanel";\r
+            this.fleetPanel.Size = new System.Drawing.Size(238, 263);\r
+            this.fleetPanel.TabIndex = 1;\r
             // \r
             // itemTreeView\r
             // \r
@@ -384,7 +384,7 @@ namespace KancolleSniffer
             this.Controls.Add(this.label3);\r
             this.Controls.Add(this.label1);\r
             this.Controls.Add(this.richTextBoxMiscText);\r
-            this.Controls.Add(this.equipPanel);\r
+            this.Controls.Add(this.fleetPanel);\r
             this.Controls.Add(this.itemTreeView);\r
             this.Controls.Add(this.shipListPanel);\r
             this.Controls.Add(this.comboBoxGroup);\r
@@ -429,7 +429,7 @@ namespace KancolleSniffer
         private System.Windows.Forms.Label label5;\r
         private System.Windows.Forms.Label label11;\r
         private System.Windows.Forms.Panel panelItemHeader;\r
-        private FleetPanel equipPanel;\r
+        private FleetPanel fleetPanel;\r
         private ItemTreeView itemTreeView;\r
         private System.Windows.Forms.RichTextBox richTextBoxMiscText;\r
         private System.Windows.Forms.ContextMenuStrip contextMenuStrip;\r
index 56ec698..6e512ed 100644 (file)
@@ -43,26 +43,26 @@ namespace KancolleSniffer
             var swipe = new SwipeScrollify();\r
             swipe.AddPanel(shipListPanel);\r
             swipe.AddTreeView(itemTreeView);\r
-            swipe.AddPanel(equipPanel);\r
+            swipe.AddPanel(fleetPanel);\r
         }\r
 \r
         public void UpdateList()\r
         {\r
-            panelItemHeader.Visible = InItemList || InEquip || InMiscText;\r
+            panelItemHeader.Visible = InItemList || InFleetInfo || InMiscText;\r
             panelGroupHeader.Visible = InGroupConfig;\r
             panelRepairHeader.Visible = InRepairList;\r
             // SwipeScrollifyが誤作動するのでEnabledも切り替える\r
             shipListPanel.Visible = shipListPanel.Enabled = InShipStatus || InGroupConfig || InRepairList;\r
             itemTreeView.Visible = itemTreeView.Enabled = InItemList;\r
-            equipPanel.Visible = equipPanel.Enabled = InEquip;\r
+            fleetPanel.Visible = fleetPanel.Enabled = InFleetInfo;\r
             richTextBoxMiscText.Visible = InMiscText;\r
             if (InItemList)\r
             {\r
                 itemTreeView.SetNodes(_sniffer.ItemList);\r
             }\r
-            else if (InEquip)\r
+            else if (InFleetInfo)\r
             {\r
-                equipPanel.UpdateEquip(_sniffer);\r
+                fleetPanel.Update(_sniffer);\r
             }\r
             else if (InMiscText)\r
             {\r
@@ -102,13 +102,13 @@ namespace KancolleSniffer
 \r
         private bool InItemList => comboBoxGroup.Text == "装備";\r
 \r
-        private bool InEquip => comboBoxGroup.Text == "艦隊";\r
+        private bool InFleetInfo => comboBoxGroup.Text == "艦隊";\r
 \r
         private bool InMiscText => comboBoxGroup.Text == "情報";\r
 \r
         private void ShipListForm_Load(object sender, EventArgs e)\r
         {\r
-            shipListPanel.Width = itemTreeView.Width = equipPanel.Width =\r
+            shipListPanel.Width = itemTreeView.Width = fleetPanel.Width =\r
                 (int)Round(PanelWidth * ShipLabel.ScaleFactor.Width) + 3 + SystemInformation.VerticalScrollBarWidth;\r
             Width = shipListPanel.Width + 12 + (Width - ClientSize.Width);\r
             MinimumSize = new Size(Width, 0);\r
@@ -157,9 +157,9 @@ namespace KancolleSniffer
             {\r
                 shipListPanel.ShowShip(id);\r
             }\r
-            else if (InEquip)\r
+            else if (InFleetInfo)\r
             {\r
-                equipPanel.ShowShip(id);\r
+                fleetPanel.ShowShip(id);\r
             }\r
         }\r
 \r
@@ -199,9 +199,9 @@ namespace KancolleSniffer
             {\r
                 ActiveControl = itemTreeView;\r
             }\r
-            else if (InEquip)\r
+            else if (InFleetInfo)\r
             {\r
-                ActiveControl = equipPanel;\r
+                ActiveControl = fleetPanel;\r
             }\r
             else\r
             {\r