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

Removed some debugging junk and fixed a null pointer exception.

Browse Source
This commit is contained in:
Richard Graham 2012-06-04 05:56:24 +00:00
parent d4c4242c7f
commit fcc243a986
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/net/sf/openrocket/simulation/CustomExpression.java
View File

@ -90,7 +90,7 @@ public class CustomExpression implements Cloneable{
* if no simulated data exists * if no simulated data exists
*/ */
private FlightDataBranch getBranch() { private FlightDataBranch getBranch() {
if ( sim == null || sim.getSimulatedData().getBranchCount() == 0){//sim.getSimulatedData().getBranch(0) == null) { if ( sim == null || sim.getSimulatedData() == null || sim.getSimulatedData().getBranchCount() == 0){
return new FlightDataBranch(); return new FlightDataBranch();
} }
else { else {
@ -173,7 +173,7 @@ public class CustomExpression implements Cloneable{
// No characters that could mess things up saving etc // No characters that could mess things up saving etc
for (char c : ",()[]{}<>".toCharArray()) for (char c : ",()[]{}<>".toCharArray())
if (symbol.indexOf(c) != -1 ) if (name.indexOf(c) != -1 )
return false; return false;
ArrayList<String> names = getAllNames().clone(); ArrayList<String> names = getAllNames().clone();
@ -223,7 +223,6 @@ public class CustomExpression implements Cloneable{
// Define the available variables as 0 // Define the available variables as 0
for (FlightDataType type : getBranch().getTypes()){ for (FlightDataType type : getBranch().getTypes()){
System.out.println( " " + type.getSymbol() );
builder.withVariable(type.getSymbol(), 0.0); builder.withVariable(type.getSymbol(), 0.0);
} }
@ -267,13 +266,17 @@ public class CustomExpression implements Cloneable{
* Returns the new flight data type corresponding to this calculated data * Returns the new flight data type corresponding to this calculated data
*/ */
public FlightDataType getType(){ public FlightDataType getType(){
// Figure out priority from order in array so that customs expressions are always at the top
int totalExpressions = sim.getCustomExpressions().size();
int p = -1*(totalExpressions-sim.getCustomExpressions().indexOf(this));
UnitGroup ug = new FixedUnitGroup(unit); UnitGroup ug = new FixedUnitGroup(unit);
FlightDataType type = FlightDataType.getType(name, symbol, ug); FlightDataType type = FlightDataType.getType(name, symbol, ug);
type.setPriority(p);
// If in a simulation, figure out priority from order in array so that customs expressions are always at the top
if (sim != null && sim.getCustomExpressions().contains(this)){
int totalExpressions = sim.getCustomExpressions().size();
int p = -1*(totalExpressions-sim.getCustomExpressions().indexOf(this));
type.setPriority(p);
}
return type; return type;
} }