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

Use proper substitutor for flight config name

Browse Source
This commit is contained in:
SiboVG 2023-02-14 04:59:44 +00:00
parent 65903bd88c
commit f38c8a48c9
1 changed files with 5 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,7 @@ import java.util.Map;
import java.util.Queue; import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ConcurrentLinkedQueue;
import net.sf.openrocket.formatting.RocketDescriptor;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -36,6 +37,7 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
private String configurationName; private String configurationName;
public static String DEFAULT_CONFIG_NAME = "[{motors}]"; public static String DEFAULT_CONFIG_NAME = "[{motors}]";
private final RocketDescriptor descriptor = Application.getInjector().getInstance(RocketDescriptor.class);
protected final Rocket rocket; protected final Rocket rocket;
protected final FlightConfigurationId fcid; protected final FlightConfigurationId fcid;
@ -566,9 +568,9 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
*/ */
public String getName() { public String getName() {
if (configurationName == null) { if (configurationName == null) {
return getOneLineMotorDescription(); configurationName = DEFAULT_CONFIG_NAME;
} }
return configurationName.replace(DEFAULT_CONFIG_NAME, getOneLineMotorDescription()); return descriptor.format(configurationName, rocket, fcid);
} }
/** /**
@ -582,34 +584,6 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
} }
return configurationName; return configurationName;
} }
private String getOneLineMotorDescription(){
StringBuilder buff = new StringBuilder("[");
boolean first = true;
int activeMotorCount = 0;
for ( RocketComponent comp : getActiveComponents() ){
if (( comp instanceof MotorMount )&&( ((MotorMount)comp).isMotorMount())){
MotorMount mount = (MotorMount)comp;
MotorConfiguration motorConfig = mount.getMotorConfig( fcid);
if( first ){
first = false;
}else{
buff.append(";");
}
if( ! motorConfig.isEmpty()){
buff.append(motorConfig.toMotorCommonName());
++activeMotorCount;
}
}
}
if( 0 == activeMotorCount ){
return trans.get("noMotors");
}
buff.append("]");
return buff.toString();
}
@Override @Override
public String toString() { return this.getName(); } public String toString() { return this.getName(); }
@ -932,7 +906,7 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
} }
public String toDebug() { public String toDebug() {
return this.fcid.toDebug()+" (#"+configurationInstanceId+") "+ getOneLineMotorDescription(); return this.fcid.toDebug()+" (#"+configurationInstanceId+") "+ getName();
} }
// DEBUG / DEVEL // DEBUG / DEVEL