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

UI now draws only active stages

Browse Source
This commit is contained in:
Daniel_M_Williams 2015-09-17 09:18:28 -04:00
parent 1d327e6dbb
commit 497fb658c7
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
swing/src/net/sf/openrocket/gui/scalefigure/RocketFigure.java
View File

@ -16,7 +16,6 @@ import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D; import java.awt.geom.Rectangle2D;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import net.sf.openrocket.gui.figureelements.FigureElement; import net.sf.openrocket.gui.figureelements.FigureElement;
@ -25,6 +24,7 @@ import net.sf.openrocket.gui.util.SwingPreferences;
import net.sf.openrocket.motor.Motor; import net.sf.openrocket.motor.Motor;
import net.sf.openrocket.motor.MotorInstance; import net.sf.openrocket.motor.MotorInstance;
import net.sf.openrocket.motor.MotorInstanceConfiguration; import net.sf.openrocket.motor.MotorInstanceConfiguration;
import net.sf.openrocket.rocketcomponent.AxialStage;
import net.sf.openrocket.rocketcomponent.ComponentAssembly; import net.sf.openrocket.rocketcomponent.ComponentAssembly;
import net.sf.openrocket.rocketcomponent.Configuration; import net.sf.openrocket.rocketcomponent.Configuration;
import net.sf.openrocket.rocketcomponent.MotorMount; import net.sf.openrocket.rocketcomponent.MotorMount;
@ -446,7 +446,14 @@ public class RocketFigure extends AbstractScaleFigure {
Transformation viewTransform = this.transformation; Transformation viewTransform = this.transformation;
Coordinate componentAbsoluteLocation = parentLocation.add(comp.getOffset()); Coordinate componentAbsoluteLocation = parentLocation.add(comp.getOffset());
if( comp instanceof AxialStage){
int num = ((AxialStage) comp).getStageNumber();
if( ! this.configuration.isStageActive(num)){
return;
}
}
// generate shapes: // generate shapes:
if( comp instanceof Rocket){ if( comp instanceof Rocket){
// no-op. no shapes // no-op. no shapes