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

Fix a bug where the motor configuration was not being pulled correctly. It is stored in the options.

Browse Source
This commit is contained in:
Kevin Ruland 2012-06-04 18:59:45 +00:00
parent 88a365ea6e
commit bedcf4ecb5
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
android/src/net/sf/openrocket/android/rocket/Simulations.java
View File

@ -127,7 +127,8 @@ implements SharedPreferences.OnSharedPreferenceChangeListener
Simulation sim = this.getItem(position); Simulation sim = this.getItem(position);
((TextView)v.findViewById(android.R.id.text1)).setText( sim.getName() ); ((TextView)v.findViewById(android.R.id.text1)).setText( sim.getName() );
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append("motors: ").append(sim.getConfiguration().getMotorConfigurationDescription()); String motorConfig = sim.getOptions().getMotorConfigurationID();
sb.append("motors: ").append(rocketDocument.getRocket().getMotorConfigurationNameOrDescription(motorConfig));
Unit distanceUnit = UnitGroup.UNITS_DISTANCE.getDefaultUnit(); Unit distanceUnit = UnitGroup.UNITS_DISTANCE.getDefaultUnit();
FlightData flightData = sim.getSimulatedData(); FlightData flightData = sim.getSimulatedData();
if ( flightData != null ) { if ( flightData != null ) {