Index: utils/josm/plugins/grid/src/grid/GridLayer.java =================================================================== --- utils/josm/plugins/grid/src/grid/GridLayer.java (revision 1501) +++ utils/josm/plugins/grid/src/grid/GridLayer.java (revision 1544) @@ -5,4 +5,5 @@ import java.awt.Component; import java.awt.Graphics; +import java.awt.GridBagLayout; import java.awt.Color; import java.awt.Point; @@ -17,6 +18,12 @@ import javax.swing.Icon; import javax.swing.ImageIcon; +import javax.swing.JDialog; +import javax.swing.JLabel; import javax.swing.JMenuItem; import javax.swing.JSeparator; +import javax.swing.JColorChooser; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JTextField; import org.openstreetmap.josm.Main; @@ -30,4 +37,7 @@ import org.openstreetmap.josm.gui.dialogs.LayerListPopup; import org.openstreetmap.josm.gui.layer.Layer; +import org.openstreetmap.josm.tools.ColorHelper; +import org.openstreetmap.josm.tools.ImageProvider; +import org.openstreetmap.josm.tools.GBC; /** @@ -35,42 +45,180 @@ */ public class GridLayer extends Layer { - + private static Icon icon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(GridPlugin.class.getResource("/images/grid.png"))); - private LatLon origin, pole; - private float gridunits; - private boolean drawLabels; - + private LatLon origin, pole; + private float gridunits; + private boolean drawLabels; + private Helmert gridtoworld; //worldtogrid; + private Color majcol = Color.RED; + public double a, b, c; public GridLayer(String url) { - super(url.indexOf('/') != -1 ? url.substring(url.indexOf('/')+1) : url); - origin = new LatLon(0.0,0.0); - pole = new LatLon(0.0,90.0); - drawLabels = true; - } - - private void setGrid(LatLon origin, LatLon pole){ - this.origin = origin; - this.pole = pole; - //need to chech pole is perpendicular from origin; - } - private void toggleLabels(){ - drawLabels=!drawLabels; - } - private class toggleLabelsAction extends AbstractAction { - GridLayer layer; - public toggleLabelsAction(GridLayer layer) { - super("show labels"); - this.layer = layer; - } - public void actionPerformed(ActionEvent e) { - layer.toggleLabels(); - } - } + super(url.indexOf('/') != -1 ? url.substring(url.indexOf('/')+1) : url); + origin = new LatLon(0.0,0.0); + pole = new LatLon(0.0,90.0); + drawLabels = true; + gridtoworld = new Helmert(0.0, 0.0, 0); + //worldtogrid = new Helmert(0.0, 0.0, 0); + } + + // private void setGrid(LatLon origin, LatLon pole){ + // this.origin = origin; + // this.pole = pole; + //need to check pole is perpendicular from origin; + // } + private void setGrid(double a, double b, double c){ + System.out.println("Setting grid to :" + a + ", " + b + ", " + c); + this.origin = origin; + this.pole = pole; + //need to chech pole is perpendicular from origin; + this.a=a; + this.b=b; + this.c=c; + gridtoworld = new Helmert(a, b, c); + System.out.println(new LatLon(10,10) + "->" + + gridtoworld.transform(new LatLon(10,10)) + "->" + + gridtoworld.inverseTransform(gridtoworld.transform(new LatLon(10,10)))); + //worldtogrid = new Helmert(-a, -b, -c); + } + + private void setUnits(float units){ + gridunits = units; + } + + private void setUnitsToLatLon(){ + gridunits = 0; + } + + + private void toggleLabels(){ + drawLabels=!drawLabels; + } + + private class toggleLabelsAction extends AbstractAction { + GridLayer layer; + public toggleLabelsAction(GridLayer layer) { + super("show labels"); + this.layer = layer; + } + public void actionPerformed(ActionEvent e) { + layer.toggleLabels(); + Main.map.repaint(); + } + } + + private class setWorldAction extends AbstractAction { + GridLayer layer; + public setWorldAction(GridLayer layer) { + super("set to world"); + this.layer = layer; + } + public void actionPerformed(ActionEvent e) { + layer.setGrid(0,0,0); + Main.map.repaint(); + } + } + private class incAAction extends AbstractAction { + GridLayer layer; + public incAAction(GridLayer layer) { + super("increase a"); + this.layer = layer; + } + public void actionPerformed(ActionEvent e) { + layer.setGrid(layer.a+10,layer.b,layer.c); + Main.map.repaint(); + } + } + private class incBAction extends AbstractAction { + GridLayer layer; + public incBAction(GridLayer layer) { + super("increase b"); + this.layer = layer; + } + public void actionPerformed(ActionEvent e) { + layer.setGrid(layer.a,layer.b+10,layer.c); + Main.map.repaint(); + } + } + private class incCAction extends AbstractAction { + GridLayer layer; + public incCAction(GridLayer layer) { + super("increase c"); + this.layer = layer; + } + public void actionPerformed(ActionEvent e) { + layer.setGrid(layer.a,layer.b,layer.c+10); + Main.map.repaint(); + } + } + private class setColorAction extends AbstractAction { + GridLayer layer; + public setColorAction(GridLayer layer) { + super("Customize Color", ImageProvider.get("colorchooser")); + this.layer = layer; + } + public void actionPerformed(ActionEvent e) { + String col=ColorHelper.color2html(layer.majcol); + JColorChooser c = new JColorChooser(ColorHelper.html2color(col)); + Object[] options = new Object[]{tr("OK"), tr("Cancel"), tr("Default")}; + int answer = JOptionPane.showOptionDialog(Main.parent, c, tr("Choose a color"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE, null, options, options[0]); + switch (answer) { + case 0: +// Main.pref.put("color.layer "+name, ColorHelper.color2html(c.getColor())); + majcol = c.getColor(); + break; + case 1: + return; + case 2: +// Main.pref.put("color.layer "+name, null); + majcol = Color.RED; + break; + } + Main.map.repaint(); + } + } + + private class setGridLayoutAction extends AbstractAction { + GridLayer layer; + public setGridLayoutAction(GridLayer layer) { + super("Set grid origin"); + this.layer = layer; + } + public void actionPerformed(ActionEvent e) { + NumberFormat nf = NumberFormat.getInstance(); + JPanel p = new JPanel(new GridBagLayout()); + JTextField latText = new JTextField(nf.format(layer.a)); + JTextField lonText = new JTextField(nf.format(layer.b)); + JTextField devText = new JTextField(nf.format(layer.c)); + p.add(new JLabel(tr("Grid origin location")), GBC.eol()); + p.add(new JLabel(tr("Latitude"))); + p.add(latText, GBC.eol()); + p.add(new JLabel(tr("Longitude"))); + p.add(lonText, GBC.eol()); + p.add(new JLabel(tr("Grid rotation"))); + p.add(devText, GBC.eol()); + Object[] options = new Object[]{tr("OK"), tr("Cancel"), tr("World")}; + int answer = JOptionPane.showOptionDialog(Main.parent, p,tr("Grid layout"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE, null, options, options[0]); + switch (answer) { + case 0: + layer.setGrid( + -Double.parseDouble(latText.getText()), + -Double.parseDouble(lonText.getText()), + Double.parseDouble(devText.getText())); + + case 1: + return; + case 2: + layer.setGrid(0,0,0); + } + Main.map.repaint(); + } + } @Override public Icon getIcon() { return icon; } - + @Override public String getToolTipText() { - return tr("Grid layer:" + origin); + return tr("Grid layer:" + a + "," + b + "," + c); } @@ -83,61 +231,96 @@ @Override public void paint(Graphics g, final MapView mv) { - //draw grid here? - //establish viewport size int w = mv.getWidth(); int h = mv.getHeight(); + + //establish viewport world coordinates + LatLon tl = mv.getLatLon(0,0); + LatLon br = mv.getLatLon(w,h); + + //establish max visible world coordinates + double wminlat = Math.max(Math.min(tl.lat(),br.lat()),-Main.proj.MAX_LAT); + double wmaxlat = Math.min(Math.max(tl.lat(),br.lat()), Main.proj.MAX_LAT); + double wminlon = Math.max(Math.min(tl.lon(),br.lon()),-Main.proj.MAX_LON); + double wmaxlon = Math.min(Math.max(tl.lon(),br.lon()), Main.proj.MAX_LON); - //establish viewport world coordinates - LatLon tl = mv.getLatLon(0,0); - LatLon br = mv.getLatLon(w,h); - - //establish max visible grid coordinates (currently also world coordinates) - double minlat = Math.max(Math.min(tl.lat(),br.lat()),-Main.proj.MAX_LAT); - double maxlat = Math.min(Math.max(tl.lat(),br.lat()), Main.proj.MAX_LAT); - double minlon = Math.max(Math.min(tl.lon(),br.lon()),-Main.proj.MAX_LON); - double maxlon = Math.min(Math.max(tl.lon(),br.lon()), Main.proj.MAX_LON); - - //span is maximum lat/lon span across visible grid normalised to 800pixels - double span = Math.max((maxlat-minlat),(maxlon-minlon)) - * 800.0/Math.max(h,w); + //establish viewport grid coordinates + //because grid is arbitrarily orientated and may be curved check several points on border + double minlat = 180, maxlat=-180, minlon=90, maxlon=-90; + + for(double x=0;x<=1;x+=0.2){ + LatLon[] p = new LatLon[] { + gridtoworld.inverseTransform(new LatLon(wminlat, x*wminlon+(1-x)*wmaxlon)), + gridtoworld.inverseTransform(new LatLon(wmaxlat, x*wminlon+(1-x)*wmaxlon)), + gridtoworld.inverseTransform(new LatLon(x*wminlat+(1-x)*wmaxlat, wminlon)), + gridtoworld.inverseTransform(new LatLon(x*wminlat+(1-x)*wmaxlat, wmaxlon))}; + for(int i=0;i<4;i++){ + maxlat=Math.max(p[i].lat(),maxlat); + minlat=Math.min(p[i].lat(),minlat); + maxlon=Math.max(p[i].lon(),maxlon); + minlon=Math.min(p[i].lon(),minlon); + } + } + + //also check if the singularities are visible + LatLon northpole = gridtoworld.transform(new LatLon(90,0)); + LatLon southpole = gridtoworld.transform(new LatLon(-90,0)); + if((northpole.lat()>=wminlat) && (northpole.lat()<=wmaxlat) && (northpole.lon()>=wminlon) && (northpole.lon()<=wmaxlon)){ + maxlat=90; + minlon=-180; + maxlon=180; + } + if((southpole.lat()>=wminlat) && (southpole.lat()<=wmaxlat) && (southpole.lon()>=wminlon) && (southpole.lon()<=wmaxlon)){ + minlat=-90; + minlon=-180; + maxlon=180; + } + + //span is maximum lat/lon span across visible grid normalised to 1600pixels + double latspan = (maxlat-minlat) * 1600.0/Math.max(h,w); + double lonspan = (maxlon-minlon) * 1600.0/Math.max(h,w); //grid spacing is power of ten to use for grid interval. - double spacing = Math.pow(10,Math.floor(Math.log(span)/Math.log(10.0))-1.0); + double latspacing = Math.pow(10,Math.floor(Math.log(latspan)/Math.log(10.0))-1.0); + double lonspacing = Math.pow(10,Math.floor(Math.log(lonspan)/Math.log(10.0))-1.0); + if (Math.max(latspan,lonspan)/Math.min(latspan,lonspan)<4){ + lonspacing = latspacing = Math.max(latspacing,lonspacing); + } + double latmaj = (latspacing>=10)?3:10; + double lonmaj = (lonspacing>=10)?3:10; //set up stuff need to draw grid NumberFormat nf = NumberFormat.getInstance(); - Color majcol = Color.RED; Color mincol = (majcol.darker()).darker(); - - System.out.println("Span: "+span); - System.out.println("Spacing: "+spacing); g.setFont (new Font("Helvetica", Font.PLAIN, 8)); FontMetrics fm = g.getFontMetrics(); - - for(double lat=spacing*Math.floor(minlat/spacing);lat