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

[fixes #436] Rocket figures now center as desired.

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

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

@ -466,16 +466,18 @@ public class RocketFigure extends AbstractScaleFigure {
*/ */
@Override @Override
protected void updateCanvasOrigin() { protected void updateCanvasOrigin() {
final int subjectWidth = (int)(subjectBounds_m.getWidth()*scale);
final int subjectHeight = (int)(subjectBounds_m.getHeight()*scale);
final Dimension subjectArea = new Dimension((int)(subjectBounds_m.getWidth()*scale),
(int)(subjectBounds_m.getHeight()*scale));
final int newOriginY = borderThickness_px.height + (int)(subjectArea.getHeight() / 2);
if (currentViewType == RocketPanel.VIEW_TYPE.BackView){ if (currentViewType == RocketPanel.VIEW_TYPE.BackView){
int newOriginX = borderThickness_px.width + getWidth() / 2; final int newOriginX = borderThickness_px.width + Math.max(getWidth(), subjectWidth + 2*borderThickness_px.width)/ 2;
final int newOriginY = borderThickness_px.height + getHeight() / 2;
originLocation_px = new Dimension(newOriginX, newOriginY); originLocation_px = new Dimension(newOriginX, newOriginY);
}else { }else if (currentViewType == RocketPanel.VIEW_TYPE.SideView){
int newOriginX = borderThickness_px.width + (getWidth() - subjectArea.width) / 2; final int newOriginX = borderThickness_px.width;
final int newOriginY = Math.max(getHeight(), subjectHeight + 2*borderThickness_px.height )/ 2;
originLocation_px = new Dimension(newOriginX, newOriginY); originLocation_px = new Dimension(newOriginX, newOriginY);
} }
} }