Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Summary view #1357

Merged
merged 11 commits into from
Jan 4, 2024
Merged

Summary view #1357

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bc9eb27
Update the summaryviews to show availability
SJuliez Dec 29, 2023
027d019
Summary: separate into items to use in all unit types
SJuliez Dec 29, 2023
e9fe68a
Summary: summary items for BM, AS, CV
SJuliez Dec 30, 2023
98cfb5c
Summary: more summary items
SJuliez Dec 30, 2023
a91a1ed
Summary: final summary items, remove unit-specific summary views
SJuliez Dec 31, 2023
f3cfb32
Summary: show avail for myomer
SJuliez Dec 31, 2023
2b2ab46
Summary: use empty String for no data
SJuliez Dec 31, 2023
fbddc9c
Summary: comments
SJuliez Dec 31, 2023
0a4936a
Summary: code correction
SJuliez Dec 31, 2023
ee70dc5
Merge branch 'master' into summary-view
SJuliez Jan 3, 2024
c11c193
Summary: Show crit space used by armor on fighters
SJuliez Jan 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions megameklab/src/megameklab/ui/combatVehicle/CVStructureTab.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import megamek.common.verifier.TestTank;
import megameklab.ui.EntitySource;
import megameklab.ui.generalUnit.*;
import megameklab.ui.generalUnit.summary.*;
import megameklab.ui.listeners.ArmorAllocationListener;
import megameklab.ui.listeners.CVBuildListener;
import megameklab.ui.util.ITab;
Expand All @@ -41,7 +42,7 @@ public class CVStructureTab extends ITab implements CVBuildListener, ArmorAlloca
private CVChassisView panChassis;
private MVFArmorView panArmor;
private MovementView panMovement;
private CVSummaryView panSummary;
private SummaryView panSummary;
private ArmorAllocationView panArmorAllocation;
private PatchworkArmorView panPatchwork;
private CVTransportView panTransport;
Expand All @@ -62,13 +63,25 @@ private void setUpPanels() {
panMovement = new MovementView(panBasicInfo);
panArmorAllocation = new ArmorAllocationView(panBasicInfo, Entity.ETYPE_TANK);
panPatchwork = new PatchworkArmorView(panBasicInfo);
panSummary = new CVSummaryView(eSource);
panTransport = new CVTransportView();
if (getTank().hasPatchworkArmor()) {
panArmorAllocation.showPatchwork(true);
} else {
panPatchwork.setVisible(false);
}
panSummary = new SummaryView(eSource,
new StructureSummaryItem(),
new EngineSummaryItem(),
new PropulsionSummaryItem(),
new HeatsinkSummaryItem(),
new ControlsSummaryItem(),
new ArmorSummaryItem(),
new JumpSummaryItem(),
new TurretSummaryItem(),
new RearTurretSummaryItem(),
new SponsonTurretSummaryItem(),
new PowerAmplifierSummaryItem(),
new EquipmentSummaryItem());

GridBagConstraints gbc;

Expand Down Expand Up @@ -119,7 +132,6 @@ private void setUpPanels() {
panChassis.setBorder(BorderFactory.createTitledBorder("Chassis"));
panMovement.setBorder(BorderFactory.createTitledBorder("Movement"));
panArmor.setBorder(BorderFactory.createTitledBorder("Armor"));
panSummary.setBorder(BorderFactory.createTitledBorder("Summary"));
panArmorAllocation.setBorder(BorderFactory.createTitledBorder("Armor Allocation"));
panPatchwork.setBorder(BorderFactory.createTitledBorder("Patchwork Armor"));
panTransport.setBorder(BorderFactory.createTitledBorder("Transport"));
Expand Down
Loading
Loading