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

Merge pull request #412 from JoePfeiffer/fixconfigurationname

Browse Source 
Fix Configuration name in motor configuration panel.
This commit is contained in:
Wes Cravens 2018-06-01 11:44:41 -05:00 committed by GitHub
commit 3d445c55b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 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; return ignitionOveride;
} }
public String toMotorDescription(){ public String toMotorDesignation(){
if( motor == null ){ if( motor == null ){
return trans.get("empty"); return trans.get("empty");
}else{ }else{
return this.motor.getDesignation() + "-" + (int)this.getEjectionDelay(); return this.motor.getDesignation(this.getEjectionDelay());
} }
} }
@ -235,7 +235,7 @@ public class MotorConfiguration implements FlightConfigurableParameter<MotorConf
} }
public String toDescription(){ public String toDescription(){
return ( this.toMotorDescription()+ return ( this.toMotorDesignation()+
" in: "+mount.getDebugName()+ " in: "+mount.getDebugName()+
" ign@: "+this.toIgnitionDescription() ); " ign@: "+this.toIgnitionDescription() );
} }
@ -251,7 +251,7 @@ public class MotorConfiguration implements FlightConfigurableParameter<MotorConf
mount.getDebugName(), mount.getDebugName(),
fcid.toShortKey(), fcid.toShortKey(),
mid.toDebug(), mid.toDebug(),
toMotorDescription(), toMotorDesignation(),
toIgnitionDescription() )); toIgnitionDescription() ));
return buf.toString(); 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(), loopFCID.toShortKey(),
curConfig.getFCID().toShortKey(), curConfig.getFCID().toShortKey(),
curConfig.getMID().toShortKey(), curConfig.getMID().toShortKey(),
curConfig.toMotorDescription(), curConfig.toMotorDesignation(),
curConfig.toIgnitionDescription() )); curConfig.toIgnitionDescription() ));
} }

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

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