hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #674 from teyrana/524-recovery-device-update

Browse Source 
[fixes #524][ui] Recovery Devices update their name in the 'Recovery' tab
This commit is contained in:
Daniel Williams 2020-05-31 00:28:22 -04:00 committed by GitHub
commit 94a9775929
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurableTableModel.java
View File

@ -88,6 +88,10 @@ public class FlightConfigurableTableModel<T extends FlightConfigurableComponent>
} }
} }
public int getColumnIndex(FlightConfigurableComponent comp) {
return components.indexOf(comp);
}
@Override @Override
public String getColumnName(int column) { public String getColumnName(int column) {
switch (column) { switch (column) {
@ -103,4 +107,4 @@ public class FlightConfigurableTableModel<T extends FlightConfigurableComponent>
} }
} }
} }

17
swing/src/net/sf/openrocket/gui/main/flightconfigpanel/RecoveryConfigurationPanel.java
View File

@ -16,11 +16,8 @@ import javax.swing.SwingUtilities;
import net.sf.openrocket.formatting.RocketDescriptor; import net.sf.openrocket.formatting.RocketDescriptor;
import net.sf.openrocket.gui.dialogs.flightconfiguration.DeploymentSelectionDialog; import net.sf.openrocket.gui.dialogs.flightconfiguration.DeploymentSelectionDialog;
import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.rocketcomponent.DeploymentConfiguration; import net.sf.openrocket.rocketcomponent.*;
import net.sf.openrocket.rocketcomponent.DeploymentConfiguration.DeployEvent; import net.sf.openrocket.rocketcomponent.DeploymentConfiguration.DeployEvent;
import net.sf.openrocket.rocketcomponent.FlightConfigurationId;
import net.sf.openrocket.rocketcomponent.RecoveryDevice;
import net.sf.openrocket.rocketcomponent.Rocket;
import net.sf.openrocket.startup.Application; import net.sf.openrocket.startup.Application;
import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.unit.UnitGroup;
@ -82,6 +79,18 @@ public class RecoveryConfigurationPanel extends FlightConfigurablePanel<Recovery
} }
} }
}); });
rocket.addComponentChangeListener(cce -> {
final RocketComponent source = cce.getSource();
if(source instanceof FlightConfigurableComponent) {
final int index = recoveryTableModel.getColumnIndex((FlightConfigurableComponent) source);
recoveryTable.getColumnModel().getColumn(index).setHeaderValue(source.getName());
// you would think this would be enough by itself, but it requires an nudge from the above lines to
// actually update.
recoveryTable.getTableHeader().resizeAndRepaint();
}
});
// recoveryTable.setColumnModel(recoveryTableModel);
recoveryTable.setDefaultRenderer(Object.class, new RecoveryTableCellRenderer()); recoveryTable.setDefaultRenderer(Object.class, new RecoveryTableCellRenderer());
return recoveryTable; return recoveryTable;