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

Jump to bottom

Infirmary cleanup #92

Merged
merged 3 commits into from
May 29, 2016
Merged

Infirmary cleanup #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
011bb26
Cleanup of the infirmary
Akjosch May 29, 2016
6e8a33f
Making getSelectedUnassignedPatients() actually pull from the unassig…
Akjosch May 29, 2016
3241ba0
Future-prooving the background image: Adding a map of gui element key…
Akjosch May 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Binary file added MekHQ/data/images/misc/field_hospital.jpg
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions MekHQ/src/mekhq/IconPackage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import java.io.File;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;

import megamek.client.ui.swing.MechTileset;
import megamek.client.ui.swing.util.ImageFileFactory;
Expand All @@ -22,6 +24,13 @@ public class IconPackage {
private DirectoryItems forceIcons;
protected static MechTileset mt;

/** A map of keys to various gui elements, for future skinning purposes */
private final Map<String, String> guiElements = new HashMap<>();
{
// Skin defaults
guiElements.put("infirmary_background", "data/images/misc/field_hospital.jpg");
}

public IconPackage() {

}
Expand Down Expand Up @@ -77,4 +86,8 @@ public DirectoryItems getForceIcons() {
public MechTileset getMechTiles() {
return mt;
}

public String getGuiElement(String key) {
return guiElements.get(key);
}
}
176 changes: 106 additions & 70 deletions MekHQ/src/mekhq/gui/CampaignGUI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.Font;
import java.awt.Graphics;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.GridLayout;
import java.awt.Image;
import java.awt.Insets;
import java.awt.Toolkit;
import java.awt.Window;
Expand All @@ -36,6 +38,7 @@
import java.awt.event.MouseEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.awt.image.ImageObserver;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.File;
Expand Down Expand Up @@ -2333,23 +2336,54 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
private void initInfirmaryTab() {
GridBagConstraints gridBagConstraints;

panInfirmary = new JPanel(new GridBagLayout());
panInfirmary = new JPanel(new GridBagLayout()) {
private static final long serialVersionUID = -4380823251614946212L;

private Image bg = null;
{
String bgImageFile = getIconPackage().getGuiElement("infirmary_background");
if(null != bgImageFile && !bgImageFile.isEmpty()) {
bg = Toolkit.getDefaultToolkit().createImage(bgImageFile);
}
}

@Override
protected void paintComponent(Graphics g)
{
super.paintComponent(g);
if(null == bg) {
return;
}
int size = Math.max(getWidth(), getHeight());
g.drawImage(bg, 0, 0, size, size, new ImageObserver() {
@Override
public boolean imageUpdate(Image img, int infoflags, int x, int y, int width, int height) {
if((infoflags & ImageObserver.ALLBITS) != 0) {
repaint();
return false;
}
return true;
}
});
}
};

doctorsModel = new DocTableModel(getCampaign());
docTable = new JTable(doctorsModel);
docTable.setRowHeight(60);
docTable.getColumnModel().getColumn(0)
.setCellRenderer(doctorsModel.getRenderer(getIconPackage()));
docTable.getSelectionModel().addListSelectionListener(
new javax.swing.event.ListSelectionListener() {
public void valueChanged(
javax.swing.event.ListSelectionEvent evt) {
docTableValueChanged(evt);
}
});
docTable.getColumnModel().getColumn(0).setCellRenderer(doctorsModel.getRenderer(getIconPackage()));
docTable.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
@Override
public void valueChanged(ListSelectionEvent evt) {
docTableValueChanged(evt);
}
});
docTable.setOpaque(false);
JScrollPane scrollDocTable = new JScrollPane(docTable);
scrollDocTable.setMinimumSize(new java.awt.Dimension(300, 300));
scrollDocTable.setPreferredSize(new java.awt.Dimension(300, 300));
scrollDocTable.setOpaque(false);
scrollDocTable.getViewport().setOpaque(false);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 0;
Expand All @@ -2361,11 +2395,11 @@ public void valueChanged(
panInfirmary.add(scrollDocTable, gridBagConstraints);

btnAssignDoc = new JButton(resourceMap.getString("btnAssignDoc.text")); // NOI18N
btnAssignDoc.setToolTipText(resourceMap
.getString("btnAssignDoc.toolTipText")); // NOI18N
btnAssignDoc.setToolTipText(resourceMap.getString("btnAssignDoc.toolTipText")); // NOI18N
btnAssignDoc.setEnabled(false);
btnAssignDoc.addActionListener(new ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
@Override
public void actionPerformed(ActionEvent evt) {
assignDoctor();
}
});
Expand All @@ -2375,11 +2409,11 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
panInfirmary.add(btnAssignDoc, gridBagConstraints);

btnUnassignDoc = new JButton(
resourceMap.getString("btnUnassignDoc.text")); // NOI18N
btnUnassignDoc = new JButton(resourceMap.getString("btnUnassignDoc.text")); // NOI18N
btnUnassignDoc.setEnabled(false);
btnUnassignDoc.addActionListener(new ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
@Override
public void actionPerformed(ActionEvent evt) {
unassignDoctor();
}
});
Expand All @@ -2393,46 +2427,42 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
listAssignedPatient = new JList<Person>(assignedPatientModel);
listAssignedPatient.setCellRenderer(assignedPatientModel
.getRenderer(getIconPackage()));
listAssignedPatient.setLayoutOrientation(JList.VERTICAL_WRAP);
listAssignedPatient.setVisibleRowCount(5);
listAssignedPatient.getSelectionModel().addListSelectionListener(
new javax.swing.event.ListSelectionListener() {
public void valueChanged(
javax.swing.event.ListSelectionEvent evt) {
patientTableValueChanged();
}
});
listAssignedPatient.setLayoutOrientation(JList.HORIZONTAL_WRAP);
listAssignedPatient.setVisibleRowCount(-1);
listAssignedPatient.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
@Override
public void valueChanged(ListSelectionEvent evt) {
patientTableValueChanged();
}
});
listAssignedPatient.setOpaque(false);
JScrollPane scrollAssignedPatient = new JScrollPane(listAssignedPatient);
scrollAssignedPatient.setMinimumSize(new java.awt.Dimension(300, 360));
scrollAssignedPatient
.setPreferredSize(new java.awt.Dimension(300, 360));

scrollAssignedPatient.setPreferredSize(new java.awt.Dimension(300, 360));
scrollAssignedPatient.setOpaque(false);
scrollAssignedPatient.getViewport().setOpaque(false);
unassignedPatientModel = new PatientTableModel(getCampaign());
listUnassignedPatient = new JList<Person>(unassignedPatientModel);
listUnassignedPatient.setCellRenderer(unassignedPatientModel
.getRenderer(getIconPackage()));
listUnassignedPatient.setLayoutOrientation(JList.HORIZONTAL_WRAP);
listUnassignedPatient.setVisibleRowCount(-1);
listUnassignedPatient.getSelectionModel().addListSelectionListener(
new javax.swing.event.ListSelectionListener() {
public void valueChanged(
javax.swing.event.ListSelectionEvent evt) {
patientTableValueChanged();
}
});
JScrollPane scrollUnassignedPatient = new JScrollPane(
listUnassignedPatient);
scrollUnassignedPatient
.setMinimumSize(new java.awt.Dimension(300, 200));
scrollUnassignedPatient.setPreferredSize(new java.awt.Dimension(300,
300));

listAssignedPatient.setBorder(BorderFactory
.createTitledBorder(resourceMap
.getString("panAssignedPatient.title")));
listUnassignedPatient.setBorder(BorderFactory
.createTitledBorder(resourceMap
.getString("panUnassignedPatient.title")));
listUnassignedPatient.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
@Override
public void valueChanged(ListSelectionEvent evt) {
patientTableValueChanged();
}
});
listUnassignedPatient.setOpaque(false);
JScrollPane scrollUnassignedPatient = new JScrollPane(listUnassignedPatient);
scrollUnassignedPatient.setMinimumSize(new java.awt.Dimension(300, 200));
scrollUnassignedPatient.setPreferredSize(new java.awt.Dimension(300, 300));
scrollUnassignedPatient.setOpaque(false);
scrollUnassignedPatient.getViewport().setOpaque(false);
listAssignedPatient.setBorder(BorderFactory.createTitledBorder(
resourceMap.getString("panAssignedPatient.title")));
listUnassignedPatient.setBorder(BorderFactory.createTitledBorder(
resourceMap.getString("panUnassignedPatient.title")));

gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
Expand Down Expand Up @@ -3927,10 +3957,9 @@ private void patientTableValueChanged() {
updateAssignDoctorEnabled();
}

private void docTableValueChanged(javax.swing.event.ListSelectionEvent evt) {
private void docTableValueChanged(ListSelectionEvent evt) {
refreshPatientList();
updateAssignDoctorEnabled();

}

private void PartsTableValueChanged(javax.swing.event.ListSelectionEvent evt) {
Expand Down Expand Up @@ -6545,36 +6574,43 @@ public void refreshPatientList() {
ArrayList<Person> unassigned = new ArrayList<Person>();
for (Person patient : getCampaign().getPatients()) {
// Knock out inactive doctors
if (patient != null
&& patient.getDoctorId() != null
&& getCampaign().getPerson(patient.getDoctorId()) != null
&& getCampaign().getPerson(patient.getDoctorId())
.isInActive()) {
if((patient != null)
&& (patient.getDoctorId() != null)
&& (getCampaign().getPerson(patient.getDoctorId()) != null)
&& getCampaign().getPerson(patient.getDoctorId()).isInActive()) {
patient.setDoctorId(null, getCampaign().getCampaignOptions()
.getNaturalHealingWaitingPeriod());
}
if (patient.getDoctorId() == null) {
if(patient.getDoctorId() == null) {
unassigned.add(patient);
} else if (doctor != null
&& patient.getDoctorId().equals(doctor.getId())) {
} else if((doctor != null) && patient.getDoctorId().equals(doctor.getId())) {
assigned.add(patient);
}
}
int assignedIdx = listAssignedPatient.getSelectedIndex();
int unassignedIdx = listUnassignedPatient.getSelectedIndex();
List<Person> assignedPatients = getSelectedAssignedPatients();
List<Person> unassignedPatients = getSelectedUnassignedPatients();
int[] assignedIndices = new int[assignedPatients.size()];
Arrays.fill(assignedIndices, Integer.MAX_VALUE);
int[] unassignedIndices = new int[unassignedPatients.size()];
Arrays.fill(unassignedIndices, Integer.MAX_VALUE);

assignedPatientModel.setData(assigned);
unassignedPatientModel.setData(unassigned);
if (assignedIdx < assignedPatientModel.getSize()) {
listAssignedPatient.setSelectedIndex(assignedIdx);
} else {
listAssignedPatient.setSelectedIndex(-1);

int i = 0;
for(Person patient : assignedPatients) {
int idx = assigned.indexOf(patient);
assignedIndices[i] = (idx >= 0) ? idx : Integer.MAX_VALUE;
++ i;
}
if (unassignedIdx < unassignedPatientModel.getSize()) {
listUnassignedPatient.setSelectedIndex(unassignedIdx);
} else {
listUnassignedPatient.setSelectedIndex(-1);
i = 0;
for(Person patient : unassignedPatients) {
int idx = unassigned.indexOf(patient);
unassignedIndices[i] = (idx >= 0) ? idx : Integer.MAX_VALUE;
++ i;
}

listAssignedPatient.setSelectedIndices(assignedIndices);
listUnassignedPatient.setSelectedIndices(unassignedIndices);
}

public void refreshPartsList() {
Expand Down Expand Up @@ -6683,7 +6719,7 @@ protected ArrayList<Person> getSelectedUnassignedPatients() {
return patients;
}
for (int idx : indices) {
Person p = assignedPatientModel.getElementAt(idx);
Person p = unassignedPatientModel.getElementAt(idx);
if (p == null) {
continue;
}
Expand Down