INSA/be-graphes
3
0
Fork 0
Code Issues 4 Releases Wiki Activity

Fix size issue for point vs. marker.

Browse Source
This commit is contained in:
Holt59 2018-02-25 12:48:21 +01:00
parent fc44ad93c3
commit 9ae576a058
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/org/insa/graphics/drawing/BasicDrawing.java
View File

@ -76,8 +76,9 @@ public class BasicDrawing extends JPanel implements Drawing {
// Default palette. // Default palette.
public static final GraphPalette DEFAULT_PALETTE = new BasicGraphPalette(); public static final GraphPalette DEFAULT_PALETTE = new BasicGraphPalette();
// Default marker width // Default marker and point width
private static final int DEFAULT_MARKER_WIDTH = 10; private static final int DEFAULT_MARKER_WIDTH = 20;
private static final int DEFAULT_POINT_WIDTH = 5;
private double long1, long2, lat1, lat2; private double long1, long2, lat1, lat2;
@ -287,7 +288,8 @@ public class BasicDrawing extends JPanel implements Drawing {
*/ */
BufferedImage img = MarkerUtils.getMarkerForColor(color); BufferedImage img = MarkerUtils.getMarkerForColor(color);
Graphics2D gr = img.createGraphics(); Graphics2D gr = img.createGraphics();
gr.scale(0.3, 0.3); double scale = DEFAULT_MARKER_WIDTH / (double) img.getHeight();
gr.scale(scale, scale);
BasicMarkerTracker marker = new BasicMarkerTracker(point, img); BasicMarkerTracker marker = new BasicMarkerTracker(point, img);
this.markers.add(marker); this.markers.add(marker);
this.repaint(); this.repaint();
@ -298,9 +300,9 @@ public class BasicDrawing extends JPanel implements Drawing {
public void drawPoint(Point point, int width, Color color) { public void drawPoint(Point point, int width, Color color) {
setWidth(width); setWidth(width);
setColor(color); setColor(color);
int x = this.projx(point.getLongitude()) - DEFAULT_MARKER_WIDTH / 2; int x = this.projx(point.getLongitude()) - DEFAULT_POINT_WIDTH / 2;
int y = this.projy(point.getLatitude()) - DEFAULT_MARKER_WIDTH / 2; int y = this.projy(point.getLatitude()) - DEFAULT_POINT_WIDTH / 2;
overlayGraphics.fillOval(x, y, DEFAULT_MARKER_WIDTH, DEFAULT_MARKER_WIDTH); overlayGraphics.fillOval(x, y, DEFAULT_POINT_WIDTH, DEFAULT_POINT_WIDTH);
this.repaint(); this.repaint();
} }