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

[#2101] Copy config name when copy/load rocket

Browse Source
This commit is contained in:
SiboVG 2023-03-20 15:52:06 +01:00
parent 98fb726c4b
commit d1d6120b21
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
View File

@ -33,7 +33,6 @@ import net.sf.openrocket.util.Transformation;
*/ */
public class FlightConfiguration implements FlightConfigurableParameter<FlightConfiguration>, Monitorable { public class FlightConfiguration implements FlightConfigurableParameter<FlightConfiguration>, Monitorable {
private static final Logger log = LoggerFactory.getLogger(FlightConfiguration.class); private static final Logger log = LoggerFactory.getLogger(FlightConfiguration.class);
private static final Translator trans = Application.getTranslator();
private String configurationName; private String configurationName;
public static String DEFAULT_CONFIG_NAME = "[{motors}]"; public static String DEFAULT_CONFIG_NAME = "[{motors}]";

8
core/src/net/sf/openrocket/rocketcomponent/Rocket.java
View File

@ -382,7 +382,9 @@ public class Rocket extends ComponentAssembly {
// the default value needs to be explicitly set, because it has different semantics // the default value needs to be explicitly set, because it has different semantics
copyRocket.configSet = new FlightConfigurableParameterSet<>(new FlightConfiguration(copyRocket)); copyRocket.configSet = new FlightConfigurableParameterSet<>(new FlightConfiguration(copyRocket));
for (FlightConfigurationId key : this.configSet.getIds()) { for (FlightConfigurationId key : this.configSet.getIds()) {
copyRocket.configSet.set(key, new FlightConfiguration(copyRocket, key)); FlightConfiguration newCfg = new FlightConfiguration(copyRocket, key);
newCfg.setName(this.configSet.get(key).getName()); // Copy config name
copyRocket.configSet.set(key, newCfg);
} }
copyRocket.selectedConfiguration = copyRocket.configSet.get( this.getSelectedConfiguration().getId()); copyRocket.selectedConfiguration = copyRocket.configSet.get( this.getSelectedConfiguration().getId());
@ -432,7 +434,9 @@ public class Rocket extends ComponentAssembly {
this.configSet.reset(); this.configSet.reset();
this.configSet.setDefault(new FlightConfiguration(this)); this.configSet.setDefault(new FlightConfiguration(this));
for (FlightConfigurationId key : source.configSet.map.keySet()) { for (FlightConfigurationId key : source.configSet.map.keySet()) {
this.configSet.set(key, new FlightConfiguration(this, key)); FlightConfiguration newCfg = new FlightConfiguration(this, key);
newCfg.setName(source.configSet.get(key).getName()); // Copy config name
this.configSet.set(key, newCfg);
} }
this.selectedConfiguration = this.configSet.get(source.getSelectedConfiguration().getId()); this.selectedConfiguration = this.configSet.get(source.getSelectedConfiguration().getId());