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

Merge pull request #487 from teyrana/fix_482_fin_shape_grid

Browse Source 
[fixes #482] Restores grid lines
This commit is contained in:
Wes Cravens 2018-11-26 15:41:37 -06:00 committed by GitHub
commit 4bd3e4ff18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,7 @@ public class FinPointFigure extends AbstractScaleFigure {
private final static Logger log = LoggerFactory.getLogger(FinPointFigure.class); private final static Logger log = LoggerFactory.getLogger(FinPointFigure.class);
private static final Color GRID_LINE_COLOR = new Color( 137, 137, 137, 32); private static final Color GRID_LINE_COLOR = new Color( 137, 137, 137, 32);
private static final float GRID_LINE_BASE_WIDTH = 0.001f; private static final int GRID_LINE_BASE_WIDTH_PIXELS = 1;
private static final int LINE_WIDTH_PIXELS = 1; private static final int LINE_WIDTH_PIXELS = 1;
@ -89,8 +89,6 @@ public class FinPointFigure extends AbstractScaleFigure {
g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_ON); RenderingHints.VALUE_ANTIALIAS_ON);
// Background grid
paintBackgroundGrid(g2); paintBackgroundGrid(g2);
paintRocketBody(g2); paintRocketBody(g2);
@ -101,12 +99,12 @@ public class FinPointFigure extends AbstractScaleFigure {
public void paintBackgroundGrid( Graphics2D g2) { public void paintBackgroundGrid( Graphics2D g2) {
Rectangle visible = g2.getClipBounds(); Rectangle visible = g2.getClipBounds();
int x0 = visible.x - 3; final double x0 = visible.x - 3;
int x1 = visible.x + visible.width + 4; final double x1 = visible.x + visible.width + 4;
int y0 = visible.y - 3; final double y0 = visible.y - 3;
int y1 = visible.y + visible.height + 4; final double y1 = visible.y + visible.height + 4;
final float grid_line_width = (float)(FinPointFigure.GRID_LINE_BASE_WIDTH/this.scale); final float grid_line_width = (float)(GRID_LINE_BASE_WIDTH_PIXELS/this.scale);
g2.setStroke(new BasicStroke( grid_line_width, g2.setStroke(new BasicStroke( grid_line_width,
BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL)); BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL));
g2.setColor(FinPointFigure.GRID_LINE_COLOR); g2.setColor(FinPointFigure.GRID_LINE_COLOR);