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

Check rocketBounds.isEmpty() rather than activeStages for length

Browse Source 
When no components are added, a rocket is showing -INFINITY for the
length. This is because the special case for length 0 is checking for
active stages, instead check the rocketBounds.isEmpty() to see if any
bounds have been added.

Fixes #714

Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
This commit is contained in:
Billy Olsen 2020-07-26 19:56:14 -07:00 committed by Billy Olsen
parent 2e14aa8b6a
commit 78a315409a
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -564,7 +564,6 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
} }
// FinSets already provide a bounding box, so let's use that. // FinSets already provide a bounding box, so let's use that.
// System.err.println(String.format("@[%s]: (#%d)", component.getName(), contexts.size()));
if (component instanceof BoxBounded) { if (component instanceof BoxBounded) {
final BoundingBox instanceBounds = ((BoxBounded) component).getInstanceBoundingBox(); final BoundingBox instanceBounds = ((BoxBounded) component).getInstanceBoundingBox();
if(instanceBounds.isEmpty()) { if(instanceBounds.isEmpty()) {
@ -612,9 +611,7 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
} }
} }
// System.err.println(String.format(" << global: %s", componentBounds.toString()));
rocketBounds.update(componentBounds); rocketBounds.update(componentBounds);
// System.err.println(String.format("<<++ rocket: %s", rocketBounds.toString()));
} }
boundsModID = rocket.getModID(); boundsModID = rocket.getModID();
@ -623,7 +620,7 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
* inactive. Its possible that this shouldn't be allowed, but it is currently * inactive. Its possible that this shouldn't be allowed, but it is currently
* so we'll just adjust the length here. * so we'll just adjust the length here.
*/ */
if (getActiveStages().isEmpty()) { if (rocketBounds.isEmpty()) {
cachedLength = 0; cachedLength = 0;
} }
cachedBounds.update( rocketBounds ); cachedBounds.update( rocketBounds );