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

Use motor common name instead of designation in MotorConfigurationPanel

Browse Source
This commit is contained in:
JoePfeiffer 2021-08-24 14:34:55 -06:00
parent 4808ed0b27
commit d6482a5be5
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/net/sf/openrocket/motor/MotorConfiguration.java
View File

@ -62,11 +62,11 @@ public class MotorConfiguration implements FlightConfigurableParameter<MotorConf
return ignitionOveride;
}
public String toMotorDesignation(){
public String toMotorCommonName(){
if( motor == null ){
return trans.get("empty");
}else{
return this.motor.getDesignation(this.getEjectionDelay());
return this.motor.getCommonName(this.getEjectionDelay());
}
}
@ -235,7 +235,7 @@ public class MotorConfiguration implements FlightConfigurableParameter<MotorConf
}
public String toDescription(){
return ( this.toMotorDesignation()+
return ( this.toMotorCommonName()+
" in: "+mount.getDebugName()+
" ign@: "+this.toIgnitionDescription() );
}
@ -251,7 +251,7 @@ public class MotorConfiguration implements FlightConfigurableParameter<MotorConf
mount.getDebugName(),
fcid.toShortKey(),
mid.toDebug(),
toMotorDesignation(),
toMotorCommonName(),
toIgnitionDescription() ));
return buf.toString();

2
core/src/net/sf/openrocket/motor/MotorConfigurationSet.java
View File

@ -58,7 +58,7 @@ public class MotorConfigurationSet extends FlightConfigurableParameterSet<MotorC
loopFCID.toShortKey(),
curConfig.getFCID().toShortKey(),
curConfig.getMID().toShortKey(),
curConfig.toMotorDesignation(),
curConfig.toMotorCommonName(),
curConfig.toIgnitionDescription() ));
}

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

@ -441,7 +441,7 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
}
if( ! motorConfig.isEmpty()){
buff.append(motorConfig.toMotorDesignation());
buff.append(motorConfig.toMotorCommonName());
++activeMotorCount;
}
}

2
swing/src/net/sf/openrocket/gui/main/flightconfigpanel/MotorConfigurationPanel.java
View File

@ -291,7 +291,7 @@ public class MotorConfigurationPanel extends FlightConfigurablePanel<MotorMount>
throw new NullPointerException("Motor has a null mount... this should never happen: "+curMotorInstance.getID());
}
String str = motor.getDesignation(curMotorInstance.getEjectionDelay());
String str = motor.getCommonName(curMotorInstance.getEjectionDelay());
int count = mount.getInstanceCount();
if (count > 1) {
str = "" + count + Chars.TIMES + " " + str;