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

Fix drawing for very small graph and add new projection for fake maps.

Browse Source
This commit is contained in:
Holt59
2018-03-21 20:39:46 +01:00
parent e2d1d47beb
commit 80b4b1c7fc
5 changed files with 170 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,6 +32,8 @@ import org.insa.graphics.drawing.Drawing;
import org.insa.graphics.drawing.DrawingClickListener;
import org.insa.graphics.drawing.GraphPalette;
import org.insa.graphics.drawing.MercatorProjection;
import org.insa.graphics.drawing.PlateCarreProjection;
import org.insa.graphics.drawing.Projection;
import org.insa.graphics.drawing.overlays.MarkerOverlay;
import org.insa.graphics.drawing.overlays.MarkerUtils;
import org.insa.graphics.drawing.overlays.Overlay;
@@ -301,7 +303,7 @@ public class BasicDrawing extends JPanel implements Drawing {
// Maximum width for the drawing (in pixels).
private static final int MAXIMUM_DRAWING_WIDTH = 2000;
private MercatorProjection projection;
private Projection projection;
// Width and height of the image
private int width, height;
@@ -573,8 +575,13 @@ public class BasicDrawing extends JPanel implements Drawing {
float deltaLon = 0.01f * diffLon, deltaLat = 0.01f * diffLat;
// Create the projection and retrieve width and height for the box.
projection = new MercatorProjection(box.extend(deltaLon, deltaLat, deltaLon, deltaLat),
MAXIMUM_DRAWING_WIDTH);
BoundingBox extendedBox = box.extend(deltaLon, deltaLat, deltaLon, deltaLat);
if (graph.getMapId().startsWith("0x")) {
projection = new PlateCarreProjection(extendedBox, MAXIMUM_DRAWING_WIDTH);
}
else {
projection = new MercatorProjection(extendedBox, MAXIMUM_DRAWING_WIDTH);
}
this.width = (int) projection.getImageWidth();
this.height = (int) projection.getImageHeight();
@@ -605,7 +612,7 @@ public class BasicDrawing extends JPanel implements Drawing {
@Override
public void drawGraph(Graph graph, GraphPalette palette) {
int repaintModulo = graph.getNodes().size() / 100;
int repaintModulo = Math.max(1, graph.getNodes().size() / 100);
// Initialize the buffered image