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

[fixes #502] Adjust RocketFigure Bounds to include negative-coordinate components

Browse Source
This commit is contained in:
Daniel_M_Williams 2018-12-21 14:40:02 -05:00
parent 1ae277bf0a
commit be1aac2c66
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -474,6 +474,7 @@ public class RocketFigure extends AbstractScaleFigure {
*/ */
@Override @Override
protected void updateCanvasOrigin() { protected void updateCanvasOrigin() {
final int subjectFront = (int)(subjectBounds_m.getMinX()*scale);
final int subjectWidth = (int)(subjectBounds_m.getWidth()*scale); final int subjectWidth = (int)(subjectBounds_m.getWidth()*scale);
final int subjectHeight = (int)(subjectBounds_m.getHeight()*scale); final int subjectHeight = (int)(subjectBounds_m.getHeight()*scale);
@ -483,7 +484,7 @@ public class RocketFigure extends AbstractScaleFigure {
originLocation_px = new Dimension(newOriginX, newOriginY); originLocation_px = new Dimension(newOriginX, newOriginY);
}else if (currentViewType == RocketPanel.VIEW_TYPE.SideView){ }else if (currentViewType == RocketPanel.VIEW_TYPE.SideView){
final int newOriginX = borderThickness_px.width; final int newOriginX = borderThickness_px.width - subjectFront;
final int newOriginY = Math.max(getHeight(), subjectHeight + 2*borderThickness_px.height )/ 2; final int newOriginY = Math.max(getHeight(), subjectHeight + 2*borderThickness_px.height )/ 2;
originLocation_px = new Dimension(newOriginX, newOriginY); originLocation_px = new Dimension(newOriginX, newOriginY);