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

[fixes #425][fixes #440] FinPointFigure contents are bottom-aligned, properly sized.

Browse Source
This commit is contained in:
Daniel_M_Williams 2018-08-19 13:30:50 +02:00
parent 10a0cabd98
commit 104b0ce74f
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
swing/src/net/sf/openrocket/gui/scalefigure/FinPointFigure.java
View File

@ -338,6 +338,7 @@ public class FinPointFigure extends AbstractScaleFigure {
@Override @Override
protected void updateSubjectDimensions(){ protected void updateSubjectDimensions(){
// update subject (i.e. Fin) bounds // update subject (i.e. Fin) bounds
finBounds_m = new BoundingBox().update(finset.getFinPoints()).toRectangle(); finBounds_m = new BoundingBox().update(finset.getFinPoints()).toRectangle();
// NOTE: the fin's forward root is pinned at 0,0 // NOTE: the fin's forward root is pinned at 0,0
@ -345,24 +346,32 @@ public class FinPointFigure extends AbstractScaleFigure {
// update to bound the parent body: // update to bound the parent body:
SymmetricComponent parent = (SymmetricComponent)this.finset.getParent(); SymmetricComponent parent = (SymmetricComponent)this.finset.getParent();
final double xParent = - finset.asPositionValue(AxialMethod.TOP); //<< in body frame final double xFinFront = finset.asPositionValue(AxialMethod.TOP);
final double xParent = -xFinFront;
final double yParent = -parent.getRadius(xParent); // from parent centerline to fin front. final double yParent = -parent.getRadius(xParent); // from parent centerline to fin front.
final double rParent = Math.max(parent.getForeRadius(), parent.getAftRadius()); final double rParent = Math.max(parent.getForeRadius(), parent.getAftRadius());
mountBounds_m = new Rectangle2D.Double( xParent, yParent, parent.getLength(), rParent); mountBounds_m = new Rectangle2D.Double( xParent, yParent, parent.getLength(), rParent);
final double subjectWidth = Math.max( finBounds_m.getWidth(), parent.getLength()); final double subjectWidth = Math.max( xFinFront + finBounds_m.getWidth(), parent.getLength());
final double subjectHeight = Math.max( 2*rParent, rParent + finBounds_m.getHeight()); final double subjectHeight = Math.max( 2*rParent, rParent + finBounds_m.getHeight());
subjectBounds_m = new Rectangle2D.Double( xParent, yParent, subjectWidth, subjectHeight); subjectBounds_m = new Rectangle2D.Double( xParent, yParent, subjectWidth, subjectHeight);
} }
@Override @Override
protected void updateCanvasOrigin() { protected void updateCanvasOrigin() {
final SymmetricComponent parent = (SymmetricComponent)this.finset.getParent(); final int finHeight = (int)(finBounds_m.getHeight()*scale);
final double rMaxParent = Math.max(parent.getForeRadius(), parent.getAftRadius()); final int mountHeight = (int)(mountBounds_m.getHeight()*scale);
final int finFrontX = (int)(subjectBounds_m.getX()*scale);
final int subjectHeight = (int)(subjectBounds_m.getHeight()*scale);
// the negative sign is to compensate for the mount's negative location. // the negative sign is to compensate for the mount's negative location.
originLocation_px.width = borderThickness_px.width - (int)(mountBounds_m.getX()*scale); originLocation_px.width = borderThickness_px.width - finFrontX;
originLocation_px.height = borderThickness_px.height + (int)(Math.max( rMaxParent, finBounds_m.getHeight())*scale);
if( visibleBounds_px.height > (subjectHeight+ 2*borderThickness_px.height)) {
originLocation_px.height = getHeight() - mountHeight - borderThickness_px.height;
}else {
originLocation_px.height = borderThickness_px.height + finHeight;
}
} }
public void resetSelectedIndex() { public void resetSelectedIndex() {