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