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

Okay that didn't work...

Browse Source
This commit is contained in:
SiboVG 2022-07-27 22:47:52 +02:00
parent 1123a5d4ea
commit ac663eb1c3
1 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -282,9 +282,7 @@ public class RocketFigure extends AbstractScaleFigure {
Color borderColor = ((SwingPreferences)Application.getPreferences()).getMotorBorderColor(); Color borderColor = ((SwingPreferences)Application.getPreferences()).getMotorBorderColor();
FlightConfiguration config = rocket.getSelectedConfiguration(); FlightConfiguration config = rocket.getSelectedConfiguration();
Iterator<MotorConfiguration> itr = config.getActiveMotors().iterator(); for (MotorConfiguration curInstance : config.getActiveMotors()) {
while (itr.hasNext()) {
MotorConfiguration curInstance = itr.next();
MotorMount mount = curInstance.getMount(); MotorMount mount = curInstance.getMount();
Motor motor = curInstance.getMotor(); Motor motor = curInstance.getMotor();
double motorLength = motor.getLength(); double motorLength = motor.getLength();
@ -297,8 +295,8 @@ public class RocketFigure extends AbstractScaleFigure {
double mountLength = mountComponent.getLength(); double mountLength = mountComponent.getLength();
// System.err.println("Drawing Motor: "+motor.getDesignation()+" (x"+mountLocations.length+")"); // System.err.println("Drawing Motor: "+motor.getDesignation()+" (x"+mountLocations.length+")");
for ( Coordinate curMountLocation : mountLocations ){ for (Coordinate curMountLocation : mountLocations) {
Coordinate curMotorLocation = curMountLocation.add( mountLength - motorLength + mount.getMotorOverhang(), 0, 0); Coordinate curMotorLocation = curMountLocation.add(mountLength - motorLength + mount.getMotorOverhang(), 0, 0);
// System.err.println(String.format(" mount instance: %s => %s", curMountLocation.toString(), curMotorLocation.toString() )); // System.err.println(String.format(" mount instance: %s => %s", curMountLocation.toString(), curMotorLocation.toString() ));
// rotate by figure's axial rotation: // rotate by figure's axial rotation:
@ -307,7 +305,7 @@ public class RocketFigure extends AbstractScaleFigure {
{ {
Shape s; Shape s;
if (currentViewType == RocketPanel.VIEW_TYPE.SideView) { if (currentViewType == RocketPanel.VIEW_TYPE.SideView) {
s = new Rectangle2D.Double( curMotorLocation.x, s = new Rectangle2D.Double(curMotorLocation.x,
(curMotorLocation.y - motorRadius), (curMotorLocation.y - motorRadius),
motorLength, motorLength,
2 * motorRadius); 2 * motorRadius);
@ -381,9 +379,7 @@ public class RocketFigure extends AbstractScaleFigure {
// allShapes is an output buffer -- it stores all the generated shapes // allShapes is an output buffer -- it stores all the generated shapes
allShapes.clear(); allShapes.clear();
Iterator<Entry<RocketComponent, ArrayList<InstanceContext>>> itr = config.getActiveInstances().entrySet().iterator(); for (Entry<RocketComponent, ArrayList<InstanceContext>> entry : config.getActiveInstances().entrySet()) {
while (itr.hasNext()) {
Entry<RocketComponent, ArrayList<InstanceContext>> entry = itr.next();
final RocketComponent comp = entry.getKey(); final RocketComponent comp = entry.getKey();
// Only draw podsets when they are selected // Only draw podsets when they are selected
@ -402,9 +398,9 @@ public class RocketFigure extends AbstractScaleFigure {
final ArrayList<InstanceContext> contextList = entry.getValue(); final ArrayList<InstanceContext> contextList = entry.getValue();
for(InstanceContext context: contextList ) { for (InstanceContext context : contextList) {
final Transformation currentTransform = this.axialRotation.applyTransformation(context.transform); final Transformation currentTransform = this.axialRotation.applyTransformation(context.transform);
allShapes = addThisShape( allShapes, this.currentViewType, comp, currentTransform); allShapes = addThisShape(allShapes, this.currentViewType, comp, currentTransform);
} }
} }
} }