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

[cosmetic] deleted extra debug code, corrected indentation

Browse Source
This commit is contained in:
Daniel_M_Williams 2015-07-24 17:13:03 -04:00
parent 5f42a10c20
commit b547084156
2 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
swing/src/net/sf/openrocket/gui/rocketfigure/BodyTubeShapes.java
View File

@ -1,6 +1,5 @@
package net.sf.openrocket.gui.rocketfigure; package net.sf.openrocket.gui.rocketfigure;
import net.sf.openrocket.rocketcomponent.Stage;
import net.sf.openrocket.util.Coordinate; import net.sf.openrocket.util.Coordinate;
import net.sf.openrocket.util.Transformation; import net.sf.openrocket.util.Transformation;

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

@ -23,15 +23,11 @@ import net.sf.openrocket.gui.figureelements.FigureElement;
import net.sf.openrocket.gui.util.ColorConversion; import net.sf.openrocket.gui.util.ColorConversion;
import net.sf.openrocket.gui.util.SwingPreferences; import net.sf.openrocket.gui.util.SwingPreferences;
import net.sf.openrocket.motor.Motor; import net.sf.openrocket.motor.Motor;
import net.sf.openrocket.rocketcomponent.BodyTube;
import net.sf.openrocket.rocketcomponent.Configuration; import net.sf.openrocket.rocketcomponent.Configuration;
import net.sf.openrocket.rocketcomponent.FinSet;
import net.sf.openrocket.rocketcomponent.MotorMount; import net.sf.openrocket.rocketcomponent.MotorMount;
import net.sf.openrocket.rocketcomponent.OutsideComponent;
import net.sf.openrocket.rocketcomponent.Rocket; import net.sf.openrocket.rocketcomponent.Rocket;
import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.rocketcomponent.RocketComponent;
import net.sf.openrocket.rocketcomponent.Stage; import net.sf.openrocket.rocketcomponent.Stage;
import net.sf.openrocket.rocketcomponent.Transition;
import net.sf.openrocket.gui.rocketfigure.RocketComponentShape; import net.sf.openrocket.gui.rocketfigure.RocketComponentShape;
import net.sf.openrocket.gui.scalefigure.RocketPanel; import net.sf.openrocket.gui.scalefigure.RocketPanel;
import net.sf.openrocket.startup.Application; import net.sf.openrocket.startup.Application;
@ -463,29 +459,17 @@ public class RocketFigure extends AbstractScaleFigure {
for( RocketComponent child: comp.getChildren() ){ for( RocketComponent child: comp.getChildren() ){
getShapeTree( allShapes, child, componentAbsoluteLocation); getShapeTree( allShapes, child, componentAbsoluteLocation);
} }
}else{ }else{
// get the offsets for each component instance
// DEBUG -- for external stages....
System.err.println(">> Drawing pStage: "+comp.getName()+" at absloc: "+componentAbsoluteLocation);
Stage testStage = (Stage)comp;
// System.err.println(">> Starting component "+component.getName()+" at: "+(instanceOffsets[0]));
// recurse to each child with each instance of this component
OutsideComponent outer = (OutsideComponent)comp;
// int instanceCount = outer.getInstanceCount();
// get the offsets for m instances
Coordinate[] instanceOffsets = new Coordinate[]{ componentAbsoluteLocation }; Coordinate[] instanceOffsets = new Coordinate[]{ componentAbsoluteLocation };
instanceOffsets = comp.shiftCoordinates( instanceOffsets); instanceOffsets = comp.shiftCoordinates( instanceOffsets);
// recurse to each child with each offset // recurse to each child with each instance of this component
for( RocketComponent child: comp.getChildren() ){ for( RocketComponent child: comp.getChildren() ){
for( Coordinate curInstanceCoordinate : instanceOffsets){ for( Coordinate curInstanceCoordinate : instanceOffsets){
getShapeTree( allShapes, child, curInstanceCoordinate); getShapeTree( allShapes, child, curInstanceCoordinate);
} }
} }
} }
return; return;