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

[#1981] Update pod/booster marker position based on axial method

Browse Source
This commit is contained in:
SiboVG 2023-01-18 00:39:02 +01:00
parent 08b9afb6ca
commit fcc3de10da
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
swing/src/net/sf/openrocket/gui/rocketfigure/ComponentAssemblyShapes.java
View File

@ -1,9 +1,11 @@
package net.sf.openrocket.gui.rocketfigure; package net.sf.openrocket.gui.rocketfigure;
import net.sf.openrocket.rocketcomponent.AxialStage; import net.sf.openrocket.rocketcomponent.AxialStage;
import net.sf.openrocket.rocketcomponent.ComponentAssembly;
import net.sf.openrocket.rocketcomponent.ParallelStage; import net.sf.openrocket.rocketcomponent.ParallelStage;
import net.sf.openrocket.rocketcomponent.PodSet; import net.sf.openrocket.rocketcomponent.PodSet;
import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.rocketcomponent.RocketComponent;
import net.sf.openrocket.rocketcomponent.position.AxialMethod;
import net.sf.openrocket.util.Color; import net.sf.openrocket.util.Color;
import net.sf.openrocket.util.Transformation; import net.sf.openrocket.util.Transformation;
@ -17,9 +19,19 @@ public class ComponentAssemblyShapes extends RocketComponentShape {
return null; return null;
} }
ComponentAssembly assembly = (ComponentAssembly) component;
// Update the marker location based on the axial method. The axial method changes the "reference point" of the component.
Transformation newTransform = transformation;
if (assembly.getAxialMethod() == AxialMethod.BOTTOM) {
newTransform = transformation.applyTransformation(new Transformation(assembly.getLength(), 0, 0));
} else if (assembly.getAxialMethod() == AxialMethod.MIDDLE) {
newTransform = transformation.applyTransformation(new Transformation(assembly.getLength() / 2, 0, 0));
}
double radius = getDisplayRadius(component); double radius = getDisplayRadius(component);
Shape[] s = EmptyShapes.getShapesSideWithSelectionSquare(transformation, radius); Shape[] s = EmptyShapes.getShapesSideWithSelectionSquare(newTransform, radius);
RocketComponentShape[] shapes = RocketComponentShape.toArray(s, component); RocketComponentShape[] shapes = RocketComponentShape.toArray(s, component);
// Set the color of the shapes // Set the color of the shapes