X-Git-Url: https://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fgui%2Fmap%2FMapCanvas.java;h=801adbb0137e61575d7d00d5468a4e115425c867;hb=92dad5df664287acb51728e9ea599f150765d34a;hp=82cf434f7387adcfe56b5ff5c9d48710844d4d66;hpb=649c5da6ee1bbc590699e11a92316ece2ea8512d;p=GpsPrune.git diff --git a/tim/prune/gui/map/MapCanvas.java b/tim/prune/gui/map/MapCanvas.java index 82cf434..801adbb 100644 --- a/tim/prune/gui/map/MapCanvas.java +++ b/tim/prune/gui/map/MapCanvas.java @@ -1,35 +1,10 @@ package tim.prune.gui.map; -import java.awt.BasicStroke; -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.FontMetrics; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.Image; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; -import java.awt.event.KeyEvent; -import java.awt.event.KeyListener; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; -import java.awt.event.MouseMotionListener; -import java.awt.event.MouseWheelEvent; -import java.awt.event.MouseWheelListener; +import java.awt.*; +import java.awt.event.*; import java.awt.image.BufferedImage; -import javax.swing.BorderFactory; -import javax.swing.BoxLayout; -import javax.swing.JButton; -import javax.swing.JCheckBox; -import javax.swing.JMenuItem; -import javax.swing.JPanel; -import javax.swing.JPopupMenu; -import javax.swing.JSlider; +import javax.swing.*; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; @@ -40,22 +15,20 @@ import tim.prune.I18nManager; import tim.prune.UpdateMessageBroker; import tim.prune.config.ColourScheme; import tim.prune.config.Config; -import tim.prune.data.Checker; -import tim.prune.data.Coordinate; -import tim.prune.data.DataPoint; -import tim.prune.data.DoubleRange; -import tim.prune.data.Latitude; -import tim.prune.data.Longitude; -import tim.prune.data.Selection; -import tim.prune.data.Track; -import tim.prune.data.TrackInfo; +import tim.prune.data.*; +import tim.prune.function.compress.MarkPointsInRectangleFunction; +import tim.prune.function.edit.FieldEdit; +import tim.prune.function.edit.FieldEditList; import tim.prune.gui.IconManager; +import tim.prune.gui.MultiStateCheckBox; +import tim.prune.gui.colour.PointColourer; +import tim.prune.tips.TipManager; /** * Class for the map canvas, to display a background map and draw on it */ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListener, DataSubscriber, - KeyListener, MouseWheelListener + KeyListener, MouseWheelListener, TileConsumer { /** App object for callbacks */ private App _app = null; @@ -65,12 +38,18 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe private TrackInfo _trackInfo = null; /** Selection object */ private Selection _selection = null; + /** Object to keep track of midpoints */ + private MidpointData _midpoints = null; + /** Index of point clicked at mouseDown */ + private int _clickedPoint = -1; /** Previously selected point */ private int _prevSelectedPoint = -1; /** Tile manager */ private MapTileManager _tileManager = new MapTileManager(this); /** Image to display */ private BufferedImage _mapImage = null; + /** Second image for drawing track (only needed for alpha blending) */ + private BufferedImage _trackImage = null; /** Slider for transparency */ private JSlider _transparencySlider = null; /** Checkbox for scale bar */ @@ -80,7 +59,9 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe /** Checkbox for autopan */ private JCheckBox _autopanCheckBox = null; /** Checkbox for connecting track points */ - private JCheckBox _connectCheckBox = null; + private MultiStateCheckBox _connectCheckBox = null; + /** Checkbox for enable edit mode */ + private JCheckBox _editmodeCheckBox = null; /** Right-click popup menu */ private JPopupMenu _popup = null; /** Top component panel */ @@ -97,22 +78,18 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe private boolean _checkBounds = false; /** Map position */ private MapPosition _mapPosition = null; - /** x coordinate of drag from point */ - private int _dragFromX = -1; - /** y coordinate of drag from point */ - private int _dragFromY = -1; - /** x coordinate of drag to point */ - private int _dragToX = -1; - /** y coordinate of drag to point */ - private int _dragToY = -1; - /** x coordinate of popup menu */ - private int _popupMenuX = -1; - /** y coordinate of popup menu */ - private int _popupMenuY = -1; + /** coordinates of drag from point */ + private int _dragFromX = -1, _dragFromY = -1; + /** coordinates of drag to point */ + private int _dragToX = -1, _dragToY = -1; + /** coordinates of popup menu */ + private int _popupMenuX = -1, _popupMenuY = -1; /** Flag to prevent showing too often the error message about loading maps */ private boolean _shownOsmErrorAlready = false; /** Current drawing mode */ private int _drawMode = MODE_DEFAULT; + /** Current waypoint icon definition */ + WpIconDefinition _waypointIconDefinition = null; /** Constant for click sensitivity when selecting nearest point */ private static final int CLICK_SENSITIVITY = 10; @@ -129,6 +106,12 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe private static final int MODE_ZOOM_RECT = 1; private static final int MODE_DRAW_POINTS_START = 2; private static final int MODE_DRAW_POINTS_CONT = 3; + private static final int MODE_DRAG_POINT = 4; + private static final int MODE_CREATE_MIDPOINT = 5; + private static final int MODE_MARK_RECTANGLE = 6; + + private static final int INDEX_UNKNOWN = -2; + /** * Constructor @@ -141,6 +124,7 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe _trackInfo = inTrackInfo; _track = inTrackInfo.getTrack(); _selection = inTrackInfo.getSelection(); + _midpoints = new MidpointData(); _mapPosition = new MapPosition(); addMouseListener(this); addMouseMotionListener(this); @@ -163,11 +147,14 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe _recalculate = true; Config.setConfigBoolean(Config.KEY_SHOW_MAP, e.getStateChange() == ItemEvent.SELECTED); UpdateMessageBroker.informSubscribers(); // to let menu know + // If the track is only partially visible and you turn the map off, make the track fully visible again + if (e.getStateChange() == ItemEvent.DESELECTED && _transparencySlider.getValue() < 0) { + _transparencySlider.setValue(0); + } } }; - _topPanel = new JPanel(); + _topPanel = new OverlayPanel(); _topPanel.setLayout(new FlowLayout()); - _topPanel.setOpaque(false); // Make slider for transparency _transparencySlider = new JSlider(-6, 6, 0); _transparencySlider.setPreferredSize(new Dimension(100, 20)); @@ -218,20 +205,32 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe _autopanCheckBox.setFocusable(false); // stop button from stealing keyboard focus _topPanel.add(_autopanCheckBox); // Add checkbox button for connecting points or not - _connectCheckBox = new JCheckBox(IconManager.getImageIcon(IconManager.POINTS_DISCONNECTED_BUTTON), true); - _connectCheckBox.setSelectedIcon(IconManager.getImageIcon(IconManager.POINTS_CONNECTED_BUTTON)); + _connectCheckBox = new MultiStateCheckBox(4); + _connectCheckBox.setIcon(0, IconManager.getImageIcon(IconManager.POINTS_WITH_ARROWS_BUTTON)); + _connectCheckBox.setIcon(1, IconManager.getImageIcon(IconManager.POINTS_HIDDEN_BUTTON)); + _connectCheckBox.setIcon(2, IconManager.getImageIcon(IconManager.POINTS_CONNECTED_BUTTON)); + _connectCheckBox.setIcon(3, IconManager.getImageIcon(IconManager.POINTS_DISCONNECTED_BUTTON)); + _connectCheckBox.setCurrentState(0); _connectCheckBox.setOpaque(false); _connectCheckBox.setToolTipText(I18nManager.getText("menu.map.connect")); _connectCheckBox.addItemListener(itemListener); _connectCheckBox.setFocusable(false); // stop button from stealing keyboard focus _topPanel.add(_connectCheckBox); + // Add checkbox button for edit mode or not + _editmodeCheckBox = new JCheckBox(IconManager.getImageIcon(IconManager.EDIT_MODE_BUTTON), false); + _editmodeCheckBox.setSelectedIcon(IconManager.getImageIcon(IconManager.EDIT_MODE_BUTTON_ON)); + _editmodeCheckBox.setOpaque(false); + _editmodeCheckBox.setToolTipText(I18nManager.getText("menu.map.editmode")); + _editmodeCheckBox.addItemListener(itemListener); + _editmodeCheckBox.setFocusable(false); // stop button from stealing keyboard focus + _topPanel.add(_editmodeCheckBox); + // Add zoom in, zoom out buttons - _sidePanel = new JPanel(); + _sidePanel = new OverlayPanel(); _sidePanel.setLayout(new BoxLayout(_sidePanel, BoxLayout.Y_AXIS)); - _sidePanel.setOpaque(false); JButton zoomInButton = new JButton(IconManager.getImageIcon(IconManager.ZOOM_IN_BUTTON)); - zoomInButton.setBorder(BorderFactory.createEmptyBorder(3, 3, 3, 3)); + zoomInButton.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); zoomInButton.setContentAreaFilled(false); zoomInButton.setToolTipText(I18nManager.getText("menu.map.zoomin")); zoomInButton.addActionListener(new ActionListener() { @@ -243,7 +242,7 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe zoomInButton.setFocusable(false); // stop button from stealing keyboard focus _sidePanel.add(zoomInButton); JButton zoomOutButton = new JButton(IconManager.getImageIcon(IconManager.ZOOM_OUT_BUTTON)); - zoomOutButton.setBorder(BorderFactory.createEmptyBorder(3, 3, 3, 3)); + zoomOutButton.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); zoomOutButton.setContentAreaFilled(false); zoomOutButton.setToolTipText(I18nManager.getText("menu.map.zoomout")); zoomOutButton.addActionListener(new ActionListener() { @@ -267,6 +266,10 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe add(_scaleBar, BorderLayout.SOUTH); // Make popup menu makePopup(); + // Get currently selected map from Config, pass to MapTileManager + _tileManager.setMapSource(Config.getConfigInt(Config.KEY_MAPSOURCE_INDEX)); + // Update display settings + dataUpdated(MAPSERVER_CHANGED); } @@ -365,31 +368,13 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe int selectedPoint = _selection.getCurrentPointIndex(); if (selectedPoint >= 0 && _dragFromX == -1 && selectedPoint != _prevSelectedPoint) { - int px = getWidth() / 2 + _mapPosition.getXFromCentre(_track.getX(selectedPoint)); - int py = getHeight() / 2 + _mapPosition.getYFromCentre(_track.getY(selectedPoint)); - int panX = 0; - int panY = 0; - if (px < PAN_DISTANCE) { - panX = px - AUTOPAN_DISTANCE; - } - else if (px > (getWidth()-PAN_DISTANCE)) { - panX = AUTOPAN_DISTANCE + px - getWidth(); - } - if (py < PAN_DISTANCE) { - panY = py - AUTOPAN_DISTANCE; - } - if (py > (getHeight()-PAN_DISTANCE)) { - panY = AUTOPAN_DISTANCE + py - getHeight(); - } - if (panX != 0 || panY != 0) { - _mapPosition.pan(panX, panY); - } + autopanToPoint(selectedPoint); } _prevSelectedPoint = selectedPoint; } // Draw the map contents if necessary - if ((_mapImage == null || _recalculate)) + if (_mapImage == null || _recalculate) { paintMapContents(); _scaleBar.updateScale(_mapPosition.getZoom(), _mapPosition.getYFromPixels(0, 0)); @@ -398,23 +383,38 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe if (_mapImage != null) { inG.drawImage(_mapImage, 0, 0, getWidth(), getHeight(), null); } - // Draw the zoom rectangle if necessary - if (_drawMode == MODE_ZOOM_RECT) - { - inG.setColor(Color.RED); - inG.drawLine(_dragFromX, _dragFromY, _dragFromX, _dragToY); - inG.drawLine(_dragFromX, _dragFromY, _dragToX, _dragFromY); - inG.drawLine(_dragToX, _dragFromY, _dragToX, _dragToY); - inG.drawLine(_dragFromX, _dragToY, _dragToX, _dragToY); - } - else if (_drawMode == MODE_DRAW_POINTS_CONT) + + switch (_drawMode) { - // draw line to mouse position to show drawing mode - inG.setColor(Config.getColourScheme().getColour(ColourScheme.IDX_POINT)); - int prevIndex = _track.getNumPoints()-1; - int px = getWidth() / 2 + _mapPosition.getXFromCentre(_track.getX(prevIndex)); - int py = getHeight() / 2 + _mapPosition.getYFromCentre(_track.getY(prevIndex)); - inG.drawLine(px, py, _dragToX, _dragToY); + case MODE_DRAG_POINT: + drawDragLines(inG, _selection.getCurrentPointIndex()-1, _selection.getCurrentPointIndex()+1); + break; + + case MODE_CREATE_MIDPOINT: + drawDragLines(inG, _clickedPoint-1, _clickedPoint); + break; + + case MODE_ZOOM_RECT: + case MODE_MARK_RECTANGLE: + if (_dragFromX != -1 && _dragFromY != -1) + { + // Draw the zoom rectangle if necessary + inG.setColor(Color.RED); + inG.drawLine(_dragFromX, _dragFromY, _dragFromX, _dragToY); + inG.drawLine(_dragFromX, _dragFromY, _dragToX, _dragFromY); + inG.drawLine(_dragToX, _dragFromY, _dragToX, _dragToY); + inG.drawLine(_dragFromX, _dragToY, _dragToX, _dragToY); + } + break; + + case MODE_DRAW_POINTS_CONT: + // draw line to mouse position to show drawing mode + inG.setColor(Config.getColourScheme().getColour(ColourScheme.IDX_POINT)); + int prevIndex = _track.getNumPoints()-1; + int px = getWidth() / 2 + _mapPosition.getXFromCentre(_track.getX(prevIndex)); + int py = getHeight() / 2 + _mapPosition.getYFromCentre(_track.getY(prevIndex)); + inG.drawLine(px, py, _dragToX, _dragToY); + break; } } else @@ -429,6 +429,45 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe paintChildren(inG); } + /** + * @return true if the currently selected point is visible, false if off-screen or nothing selected + */ + private boolean isCurrentPointVisible() + { + if (_trackInfo.getCurrentPoint() == null) {return false;} + final int selectedPoint = _selection.getCurrentPointIndex(); + final int xFromCentre = Math.abs(_mapPosition.getXFromCentre(_track.getX(selectedPoint))); + if (xFromCentre > (getWidth()/2)) {return false;} + final int yFromCentre = Math.abs(_mapPosition.getYFromCentre(_track.getY(selectedPoint))); + return yFromCentre < (getHeight()/2); + } + + /** + * If the specified point isn't visible, pan to it + * @param inIndex index of selected point + */ + private void autopanToPoint(int inIndex) + { + int px = getWidth() / 2 + _mapPosition.getXFromCentre(_track.getX(inIndex)); + int py = getHeight() / 2 + _mapPosition.getYFromCentre(_track.getY(inIndex)); + int panX = 0; + int panY = 0; + if (px < PAN_DISTANCE) { + panX = px - AUTOPAN_DISTANCE; + } + else if (px > (getWidth()-PAN_DISTANCE)) { + panX = AUTOPAN_DISTANCE + px - getWidth(); + } + if (py < (2*PAN_DISTANCE)) { + panY = py - AUTOPAN_DISTANCE; + } + if (py > (getHeight()-PAN_DISTANCE)) { + panY = AUTOPAN_DISTANCE + py - getHeight(); + } + if (panX != 0 || panY != 0) { + _mapPosition.pan(panX, panY); + } + } /** * Paint the map tiles and the points on to the _mapImage @@ -440,15 +479,28 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe _mapImage = new BufferedImage(getWidth(), getHeight(), BufferedImage.TYPE_INT_RGB); } - // Clear map Graphics g = _mapImage.getGraphics(); + // Set antialiasing according to config + ((Graphics2D) g).setRenderingHint(RenderingHints.KEY_ANTIALIASING, + Config.getConfigBoolean(Config.KEY_ANTIALIAS) ? RenderingHints.VALUE_ANTIALIAS_ON : RenderingHints.VALUE_ANTIALIAS_OFF); // Clear to background g.setColor(Config.getColourScheme().getColour(ColourScheme.IDX_BACKGROUND)); g.fillRect(0, 0, getWidth(), getHeight()); // Check whether maps are on or not - boolean showMap = Config.getConfigBoolean(Config.KEY_SHOW_MAP); + final boolean showMap = Config.getConfigBoolean(Config.KEY_SHOW_MAP); _mapCheckBox.setSelected(showMap); + // Check whether disk cache is on or not + final boolean usingDiskCache = Config.getConfigString(Config.KEY_DISK_CACHE) != null; + // Show tip to recommend setting up a cache + if (showMap && !usingDiskCache && Config.getConfigBoolean(Config.KEY_ONLINE_MODE)) + { + SwingUtilities.invokeLater(new Runnable() { + public void run() { + _app.showTip(TipManager.Tip_UseAMapCache); + } + }); + } // reset error message if (!showMap) {_shownOsmErrorAlready = false;} @@ -483,7 +535,7 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe // Loop over layers for (int l=0; l 0.0f) + { + // Paint the track points on top + boolean pointsPainted = true; + try + { + if (trackOpacity > 0.9f) + { + // Track is fully opaque, just draw it directly + pointsPainted = paintPoints(g); + _trackImage = null; + } + else + { + // Track is partly transparent, so use a separate BufferedImage + if (_trackImage == null || _trackImage.getWidth() != getWidth() || _trackImage.getHeight() != getHeight()) + { + _trackImage = new BufferedImage(getWidth(), getHeight(), BufferedImage.TYPE_INT_ARGB); + } + // Clear to transparent + Graphics2D gTrack = _trackImage.createGraphics(); + gTrack.setComposite(AlphaComposite.getInstance(AlphaComposite.CLEAR, 0.0f)); + gTrack.fillRect(0, 0, getWidth(), getHeight()); + gTrack.setPaintMode(); + // Draw the track onto this separate image + pointsPainted = paintPoints(gTrack); + ((Graphics2D) g).setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, trackOpacity)); + g.drawImage(_trackImage, 0, 0, null); + } + } + catch (NullPointerException npe) {} // ignore, probably due to data being changed during drawing + catch (ArrayIndexOutOfBoundsException obe) {} // also ignore + + // Zoom to fit if no points found + if (!pointsPainted && _checkBounds) + { + zoomToFit(); + _recalculate = true; + repaint(); + } } // free g g.dispose(); - // Zoom to fit if no points found - if (pointsPainted <= 0 && _checkBounds) { - zoomToFit(); - _recalculate = true; - repaint(); - } _checkBounds = false; // enable / disable transparency slider _transparencySlider.setEnabled(showMap); @@ -531,21 +617,30 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe /** * Paint the points using the given graphics object * @param inG Graphics object to use for painting - * @return number of points painted, if any + * @return true if any points or lines painted */ - private int paintPoints(Graphics inG) + private boolean paintPoints(Graphics inG) { // Set up colours final ColourScheme cs = Config.getColourScheme(); - final int[] opacities = {255, 190, 130, 80, 40, 0}; - int opacity = 255; - if (_transparencySlider.getValue() < 0) - opacity = opacities[-1 - _transparencySlider.getValue()]; - final Color pointColour = makeTransparentColour(cs.getColour(ColourScheme.IDX_POINT), opacity); - final Color rangeColour = makeTransparentColour(cs.getColour(ColourScheme.IDX_SELECTION), opacity); - final Color currentColour = makeTransparentColour(cs.getColour(ColourScheme.IDX_PRIMARY), opacity); - final Color secondColour = makeTransparentColour(cs.getColour(ColourScheme.IDX_SECONDARY), opacity); - final Color textColour = makeTransparentColour(cs.getColour(ColourScheme.IDX_TEXT), opacity); + final Color pointColour = cs.getColour(ColourScheme.IDX_POINT); + final Color rangeColour = cs.getColour(ColourScheme.IDX_SELECTION); + final Color currentColour = cs.getColour(ColourScheme.IDX_PRIMARY); + final Color secondColour = cs.getColour(ColourScheme.IDX_SECONDARY); + final Color textColour = cs.getColour(ColourScheme.IDX_TEXT); + final PointColourer pointColourer = _app.getPointColourer(); + + final int winWidth = getWidth(); + final int winHeight = getHeight(); + final int halfWinWidth = winWidth / 2; + final int halfWinHeight = winHeight / 2; + + final int numPoints = _track.getNumPoints(); + final int[] xPixels = new int[numPoints]; + final int[] yPixels = new int[numPoints]; + + final int pointSeparationForArrowsSqd = 350; + final int pointSeparation1dForArrows = (int) (Math.sqrt(pointSeparationForArrowsSqd) * 0.7); // try to set line width for painting if (inG instanceof Graphics2D) @@ -554,44 +649,100 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe if (lineWidth < 1 || lineWidth > 4) {lineWidth = 2;} ((Graphics2D) inG).setStroke(new BasicStroke(lineWidth)); } - int pointsPainted = 0; + + boolean pointsPainted = false; // draw track points inG.setColor(pointColour); int prevX = -1, prevY = -1; - boolean connectPoints = _connectCheckBox.isSelected(); + final int connectState = _connectCheckBox.getCurrentState(); + final boolean drawLines = (connectState != 3); // 0, 1 or 2 + final boolean drawPoints = (connectState != 1); // 0, 2 or 3 + final boolean drawArrows = (connectState == 0); // 0 + boolean prevPointVisible = false, currPointVisible = false; boolean anyWaypoints = false; boolean isWaypoint = false; - for (int i=0; i<_track.getNumPoints(); i++) + boolean drawnLastArrow = false; // avoid painting arrows on adjacent lines, looks too busy + for (int i=0; i= 0 && px < getWidth() && py >= 0 && py < getHeight(); + // Calculate pixel position of point from its x, y coordinates + int px = halfWinWidth + _mapPosition.getXFromCentre(_track.getX(i)); + int py = halfWinHeight + _mapPosition.getYFromCentre(_track.getY(i)); + px = wrapLongitudeValue(px, winWidth, _mapPosition.getZoom()); + // Remember these calculated pixel values so they don't have to be recalculated + xPixels[i] = px; yPixels[i] = py; + + currPointVisible = px >= 0 && px < winWidth && py >= 0 && py < winHeight; isWaypoint = _track.getPoint(i).isWaypoint(); anyWaypoints = anyWaypoints || isWaypoint; - if (currPointVisible) + if (!isWaypoint) { - if (!isWaypoint) + if (currPointVisible || (drawLines && prevPointVisible)) { - // Draw rectangle for track point + // For track points, work out which colour to use if (_track.getPoint(i).getDeleteFlag()) { inG.setColor(currentColour); } - else { + else if (pointColourer != null) + { // use the point colourer if there is one + Color trackColour = pointColourer.getColour(i); + inG.setColor(trackColour); + } + else + { inG.setColor(pointColour); } - inG.drawRect(px-2, py-2, 3, 3); - pointsPainted++; + + // Draw rectangle for track point if it's visible + if (currPointVisible) + { + if (drawPoints) { + inG.drawRect(px-2, py-2, 3, 3); + } + pointsPainted = true; + } } - } - if (!isWaypoint) - { + // Connect track points if either of them are visible - if (connectPoints && (currPointVisible || prevPointVisible) + if (drawLines + && (currPointVisible || prevPointVisible) && !(prevX == -1 && prevY == -1) && !_track.getPoint(i).getSegmentStart()) { inG.drawLine(prevX, prevY, px, py); + pointsPainted = true; + + // Now consider whether we need to draw an arrow as well + if (drawArrows + && !drawnLastArrow + && (Math.abs(prevX-px) > pointSeparation1dForArrows || Math.abs(prevY-py) > pointSeparation1dForArrows)) + { + final double pointSeparationSqd = (prevX-px) * (prevX-px) + (prevY-py) * (prevY-py); + if (pointSeparationSqd > pointSeparationForArrowsSqd) + { + final double midX = (prevX + px) / 2; + final double midY = (prevY + py) / 2; + final boolean midPointVisible = midX >= 0 && midX < winWidth && midY >= 0 && midY < winHeight; + if (midPointVisible) + { + final double alpha = Math.atan2(py - prevY, px - prevX); + //System.out.println("Draw arrow from (" + prevX + "," + prevY + ") to (" + px + "," + py + // + ") with angle" + (int) (alpha * 180/Math.PI)); + final double MID_TO_VERTEX = 3.0; + final double arrowX = MID_TO_VERTEX * Math.cos(alpha); + final double arrowY = MID_TO_VERTEX * Math.sin(alpha); + final double vertexX = midX + arrowX; + final double vertexY = midY + arrowY; + inG.drawLine((int)(midX-arrowX-2*arrowY), (int)(midY-arrowY+2*arrowX), (int)vertexX, (int)vertexY); + inG.drawLine((int)(midX-arrowX+2*arrowY), (int)(midY-arrowY-2*arrowX), (int)vertexX, (int)vertexY); + } + drawnLastArrow = midPointVisible; + } + } + else + { + drawnLastArrow = false; + } } prevX = px; prevY = py; } @@ -602,49 +753,70 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe inG.setColor(textColour); FontMetrics fm = inG.getFontMetrics(); int nameHeight = fm.getHeight(); - int width = getWidth(); - int height = getHeight(); - if (anyWaypoints) { + if (anyWaypoints) + { + int numWaypoints = 0; for (int i=0; i<_track.getNumPoints(); i++) { if (_track.getPoint(i).isWaypoint()) { - int px = getWidth() / 2 + _mapPosition.getXFromCentre(_track.getX(i)); - int py = getHeight() / 2 + _mapPosition.getYFromCentre(_track.getY(i)); - if (px >= 0 && px < getWidth() && py >= 0 && py < getHeight()) + int px = xPixels[i]; + int py = yPixels[i]; + if (px >= 0 && px < winWidth && py >= 0 && py < winHeight) { - inG.fillRect(px-3, py-3, 6, 6); - pointsPainted++; + if (_waypointIconDefinition == null) + { + inG.fillRect(px-3, py-3, 6, 6); + } + else + { + ImageIcon icon = _waypointIconDefinition.getImageIcon(); + if (icon != null) + { + inG.drawImage(icon.getImage(), px-_waypointIconDefinition.getXOffset(), + py-_waypointIconDefinition.getYOffset(), null); + } + } + pointsPainted = true; + numWaypoints++; } } } + // Take more care with waypoint names if less than 100 are visible + final int numNameSteps = (numWaypoints > 100 ? 1 : 4); + final int numPointSteps = (numWaypoints > 1000 ? 2 : 1); + // Loop over points again, now draw names for waypoints - for (int i=0; i<_track.getNumPoints(); i++) + int[] nameXs = {0, 0, 0, 0}; + int[] nameYs = {0, 0, 0, 0}; + for (int i=0; i<_track.getNumPoints(); i += numPointSteps) { if (_track.getPoint(i).isWaypoint()) { - int px = getWidth() / 2 + _mapPosition.getXFromCentre(_track.getX(i)); - int py = getHeight() / 2 + _mapPosition.getYFromCentre(_track.getY(i)); - if (px >= 0 && px < getWidth() && py >= 0 && py < getHeight()) + int px = xPixels[i]; + int py = yPixels[i]; + if (px >= 0 && px < winWidth && py >= 0 && py < winHeight) { // Figure out where to draw waypoint name so it doesn't obscure track String waypointName = _track.getPoint(i).getWaypointName(); int nameWidth = fm.stringWidth(waypointName); boolean drawnName = false; // Make arrays for coordinates right left up down - int[] nameXs = {px + 2, px - nameWidth - 2, px - nameWidth/2, px - nameWidth/2}; - int[] nameYs = {py + (nameHeight/2), py + (nameHeight/2), py - 2, py + nameHeight + 2}; - for (int extraSpace = 4; extraSpace < 13 && !drawnName; extraSpace+=2) + nameXs[0] = px + 2; nameXs[1] = px - nameWidth - 2; + nameXs[2] = nameXs[3] = px - nameWidth/2; + nameYs[0] = nameYs[1] = py + (nameHeight/2); + nameYs[2] = py - 2; nameYs[3] = py + nameHeight + 2; + for (int extraSpace = 0; extraSpace < numNameSteps && !drawnName; extraSpace++) { // Shift arrays for coordinates right left up down - nameXs[0] += 2; nameXs[1] -= 2; - nameYs[2] -= 2; nameYs[3] += 2; + nameXs[0] += 3; nameXs[1] -= 3; + nameYs[2] -= 3; nameYs[3] += 3; // Check each direction in turn right left up down for (int a=0; a<4; a++) { - if (nameXs[a] > 0 && (nameXs[a] + nameWidth) < width - && nameYs[a] < height && (nameYs[a] - nameHeight) > 0 - && !overlapsPoints(nameXs[a], nameYs[a], nameWidth, nameHeight, textColour)) + if (nameXs[a] > 0 && (nameXs[a] + nameWidth) < winWidth + && nameYs[a] < winHeight && (nameYs[a] - nameHeight) > 0 + && !MapUtils.overlapsPoints(_mapImage, nameXs[a], nameYs[a], nameWidth, nameHeight, textColour)) { // Found a rectangle to fit - draw name here and quit inG.drawString(waypointName, nameXs[a], nameYs[a]); @@ -663,13 +835,13 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe { if (_track.getPoint(i).hasMedia()) { - int px = getWidth() / 2 + _mapPosition.getXFromCentre(_track.getX(i)); - int py = getHeight() / 2 + _mapPosition.getYFromCentre(_track.getY(i)); - if (px >= 0 && px < getWidth() && py >= 0 && py < getHeight()) + int px = xPixels[i]; + int py = yPixels[i]; + if (px >= 0 && px < winWidth && py >= 0 && py < winHeight) { inG.drawRect(px-1, py-1, 2, 2); inG.drawRect(px-2, py-2, 4, 4); - pointsPainted++; + pointsPainted = true; } } } @@ -680,107 +852,109 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe inG.setColor(rangeColour); for (int i=_selection.getStart(); i<=_selection.getEnd(); i++) { - int px = getWidth() / 2 + _mapPosition.getXFromCentre(_track.getX(i)); - int py = getHeight() / 2 + _mapPosition.getYFromCentre(_track.getY(i)); + int px = xPixels[i]; + int py = yPixels[i]; inG.drawRect(px-1, py-1, 2, 2); } } - // Draw selected point, crosshairs + // Draw crosshairs at selected point int selectedPoint = _selection.getCurrentPointIndex(); if (selectedPoint >= 0) { - int px = getWidth() / 2 + _mapPosition.getXFromCentre(_track.getX(selectedPoint)); - int py = getHeight() / 2 + _mapPosition.getYFromCentre(_track.getY(selectedPoint)); + int px = xPixels[selectedPoint]; + int py = yPixels[selectedPoint]; inG.setColor(currentColour); // crosshairs - inG.drawLine(px, 0, px, getHeight()); - inG.drawLine(0, py, getWidth(), py); - // oval - inG.drawOval(px - 2, py - 2, 4, 4); - inG.drawOval(px - 3, py - 3, 6, 6); + inG.drawLine(px, 0, px, winHeight); + inG.drawLine(0, py, winWidth, py); } // Return the number of points painted return pointsPainted; } - /** - * Tests whether there are any dark pixels within the specified x,y rectangle - * @param inX left X coordinate - * @param inY bottom Y coordinate - * @param inWidth width of rectangle - * @param inHeight height of rectangle - * @param inTextColour colour of text - * @return true if the rectangle overlaps stuff too close to the given colour + * Wrap the given pixel value if appropriate and possible + * @param inPx Pixel x coordinate + * @param inWinWidth window width in pixels + * @param inZoom zoom level + * @return modified pixel x coordinate */ - private boolean overlapsPoints(int inX, int inY, int inWidth, int inHeight, Color inTextColour) + private static int wrapLongitudeValue(int inPx, int inWinWidth, int inZoom) { - // each of the colour channels must be further away than this to count as empty - final int BRIGHTNESS_LIMIT = 80; - final int textRGB = inTextColour.getRGB(); - final int textLow = textRGB & 255; - final int textMid = (textRGB >> 8) & 255; - final int textHigh = (textRGB >> 16) & 255; - try + if (inPx > inWinWidth) { - // loop over x coordinate of rectangle - for (int x=0; x> 8) & 255; - int pixHigh = (pixelColor >> 16) & 255; - //int fourthBit = (pixelColor >> 24) & 255; // alpha ignored - // If colours are too close in any channel then it's an overlap - if (Math.abs(pixLow-textLow) < BRIGHTNESS_LIMIT || - Math.abs(pixMid-textMid) < BRIGHTNESS_LIMIT || - Math.abs(pixHigh-textHigh) < BRIGHTNESS_LIMIT) {return true;} - } + // Pixel is too far right, could we wrap it back onto the screen? + int px = inPx; + while (px > inWinWidth) { + px -= (256 << inZoom); + } + if (px >= 0) { + return px; // successfully wrapped back onto the screen } } - catch (NullPointerException e) { - // ignore null pointers, just return false + else if (inPx < 0) + { + // Pixel is too far left, could we wrap it back onto the screen? + int px = inPx; + while (px < 0) { + px += (256 << inZoom); + } + if (px < inWinWidth) { + return px; // successfully wrapped back onto the screen + } } - return false; + // Either it's already on the screen or couldn't be wrapped + return inPx; } /** - * Make a semi-transparent colour for drawing with - * @param inColour base colour (fully opaque) - * @param inOpacity opacity where 0=invisible and 255=full - * @return new colour object + * Draw the lines while dragging a point + * @param inG graphics object + * @param inPrevIndex index of point to draw from + * @param inNextIndex index of point to draw to */ - private static Color makeTransparentColour(Color inColour, int inOpacity) + private void drawDragLines(Graphics inG, int inPrevIndex, int inNextIndex) { - if (inOpacity > 240) return inColour; - return new Color(inColour.getRed(), inColour.getGreen(), inColour.getBlue(), inOpacity); + inG.setColor(Config.getColourScheme().getColour(ColourScheme.IDX_POINT)); + // line from prev point to cursor + if (inPrevIndex > -1 && !_track.getPoint(inPrevIndex+1).getSegmentStart()) + { + final int px = getWidth() / 2 + _mapPosition.getXFromCentre(_track.getX(inPrevIndex)); + final int py = getHeight() / 2 + _mapPosition.getYFromCentre(_track.getY(inPrevIndex)); + inG.drawLine(px, py, _dragToX, _dragToY); + } + if (inNextIndex < _track.getNumPoints() && !_track.getPoint(inNextIndex).getSegmentStart()) + { + final int px = getWidth() / 2 + _mapPosition.getXFromCentre(_track.getX(inNextIndex)); + final int py = getHeight() / 2 + _mapPosition.getYFromCentre(_track.getY(inNextIndex)); + inG.drawLine(px, py, _dragToX, _dragToY); + } } /** * Inform that tiles have been updated and the map can be repainted * @param inIsOk true if data loaded ok, false for error */ - public synchronized void tilesUpdated(boolean inIsOk) + public void tilesUpdated(boolean inIsOk) { - // Show message if loading failed (but not too many times) - if (!inIsOk && !_shownOsmErrorAlready && _mapCheckBox.isSelected()) + synchronized(this) { - _shownOsmErrorAlready = true; - // use separate thread to show message about failing to load osm images - new Thread(new Runnable() { - public void run() { - try {Thread.sleep(500);} catch (InterruptedException ie) {} - _app.showErrorMessage("error.osmimage.dialogtitle", "error.osmimage.failed"); - } - }).start(); + // Show message if loading failed (but not too many times) + if (!inIsOk && !_shownOsmErrorAlready && _mapCheckBox.isSelected()) + { + _shownOsmErrorAlready = true; + // use separate thread to show message about failing to load osm images + new Thread(new Runnable() { + public void run() { + try {Thread.sleep(500);} catch (InterruptedException ie) {} + _app.showErrorMessage("error.osmimage.dialogtitle", "error.osmimage.failed"); + } + }).start(); + } + _recalculate = true; + repaint(); } - _recalculate = true; - repaint(); } /** @@ -798,7 +972,12 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe */ public void zoomIn() { + // See if selected point is currently visible, if so (and autopan on) then autopan after zoom to keep it visible + boolean wasVisible = _autopanCheckBox.isSelected() && isCurrentPointVisible(); _mapPosition.zoomIn(); + if (wasVisible && !isCurrentPointVisible()) { + autopanToPoint(_selection.getCurrentPointIndex()); + } _recalculate = true; repaint(); } @@ -829,6 +1008,48 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe new Longitude(lon, Coordinate.FORMAT_NONE), null); } + /** + * Move a DataPoint object to the given mouse coordinates + * @param startX start x coordinate of mouse + * @param startY start y coordinate of mouse + * @param endX end x coordinate of mouse + * @param endY end y coordinate of mouse + */ + private void movePointToMouse(int startX, int startY, int endX, int endY ) + { + double lat1 = MapUtils.getLatitudeFromY(_mapPosition.getYFromPixels(startY, getHeight())); + double lon1 = MapUtils.getLongitudeFromX(_mapPosition.getXFromPixels(startX, getWidth())); + double lat_delta = MapUtils.getLatitudeFromY(_mapPosition.getYFromPixels(endY, getHeight())) - lat1; + double lon_delta = MapUtils.getLongitudeFromX(_mapPosition.getXFromPixels(endX, getWidth())) - lon1; + + DataPoint point = _trackInfo.getCurrentPoint(); + if (point == null) { + return; + } + + // Make lists for edit and undo, and add each changed field in turn + FieldEditList editList = new FieldEditList(); + FieldEditList undoList = new FieldEditList(); + + // Check field list + FieldList fieldList = _track.getFieldList(); + int numFields = fieldList.getNumFields(); + for (int i=0; i= 0) + { + // TODO: maybe use another color of the cross or remove the cross while dragging??? + + _trackInfo.selectPoint(_clickedPoint); + if (_trackInfo.getCurrentPoint() != null) + { + _drawMode = MODE_DRAG_POINT; + _dragFromX = _dragToX = inE.getX(); + _dragFromY = _dragToY = inE.getY(); + } + } + else + { + // Not a click on a point, so check half-way between two (connected) trackpoints + int midpointIndex = _midpoints.getNearestPointIndex(clickX, clickY, clickSens); + if (midpointIndex > 0) + { + _drawMode = MODE_CREATE_MIDPOINT; + _clickedPoint = midpointIndex; + _dragFromX = _dragToX = inE.getX(); + _dragFromY = _dragToY = inE.getY(); + } + } + } + } + } + // else right-press ignored } /** @@ -945,13 +1216,48 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe public void mouseReleased(MouseEvent inE) { _recalculate = true; - if (_drawMode == MODE_ZOOM_RECT && Math.abs(_dragToX - _dragFromX) > 20 - && Math.abs(_dragToY - _dragFromY) > 20) + + if (_drawMode == MODE_DRAG_POINT) { - _mapPosition.zoomToPixels(_dragFromX, _dragToX, _dragFromY, _dragToY, getWidth(), getHeight()); + if (Math.abs(_dragToX - _dragFromX) > 2 + || Math.abs(_dragToY - _dragFromY) > 2) + { + movePointToMouse(_dragFromX, _dragFromY, _dragToX, _dragToY ); + } + _drawMode = MODE_DEFAULT; } - if (_drawMode == MODE_ZOOM_RECT) { + else if (_drawMode == MODE_CREATE_MIDPOINT) + { _drawMode = MODE_DEFAULT; + _app.createPoint(createPointFromClick(_dragToX, _dragToY), _clickedPoint); + } + else if (_drawMode == MODE_ZOOM_RECT) + { + if (Math.abs(_dragToX - _dragFromX) > 20 + && Math.abs(_dragToY - _dragFromY) > 20) + { + _mapPosition.zoomToPixels(_dragFromX, _dragToX, _dragFromY, _dragToY, getWidth(), getHeight()); + } + _drawMode = MODE_DEFAULT; + } + else if (_drawMode == MODE_MARK_RECTANGLE) + { + // Reset app mode + _app.setCurrentMode(App.AppMode.NORMAL); + _drawMode = MODE_DEFAULT; + // Call a function to mark the points + MarkPointsInRectangleFunction marker = (MarkPointsInRectangleFunction) FunctionLibrary.FUNCTION_MARK_IN_RECTANGLE; + double lon1 = MapUtils.getLongitudeFromX(_mapPosition.getXFromPixels(_dragFromX, getWidth())); + double lat1 = MapUtils.getLatitudeFromY(_mapPosition.getYFromPixels(_dragFromY, getHeight())); + double lon2 = MapUtils.getLongitudeFromX(_mapPosition.getXFromPixels(_dragToX, getWidth())); + double lat2 = MapUtils.getLatitudeFromY(_mapPosition.getYFromPixels(_dragToY, getHeight())); + // Invalidate rectangle if pixel coords are (-1,-1) + if (_dragFromX < 0 || _dragFromY < 0) { + lon1 = lon2; + lat1 = lat2; + } + marker.setRectCoords(lon1, lat1, lon2, lat2); + marker.begin(); } _dragFromX = _dragFromY = -1; repaint(); @@ -965,19 +1271,40 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe { if (!inE.isMetaDown()) { - // Left mouse drag - pan map by appropriate amount - if (_dragFromX != -1) + // Left mouse drag - either drag the point or pan the map + if (_drawMode == MODE_DRAG_POINT || _drawMode == MODE_CREATE_MIDPOINT) { - panMap(_dragFromX - inE.getX(), _dragFromY - inE.getY()); + // move point + _dragToX = inE.getX(); + _dragToY = inE.getY(); _recalculate = true; repaint(); } - _dragFromX = _dragToX = inE.getX(); - _dragFromY = _dragToY = inE.getY(); + else if (_drawMode == MODE_MARK_RECTANGLE) + { + // draw a rectangle for marking points + if (_dragFromX == -1) { + _dragFromX = inE.getX(); + _dragFromY = inE.getY(); + } + _dragToX = inE.getX(); + _dragToY = inE.getY(); + repaint(); + } + else + { + // regular left-drag pans map by appropriate amount + if (_dragFromX != -1) + { + panMap(_dragFromX - inE.getX(), _dragFromY - inE.getY()); + } + _dragFromX = _dragToX = inE.getX(); + _dragFromY = _dragToY = inE.getY(); + } } else { - // Right-click and drag - draw rectangle and control zoom + // Right-click and drag - update rectangle _drawMode = MODE_ZOOM_RECT; if (_dragFromX == -1) { _dragFromX = inE.getX(); @@ -995,6 +1322,8 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe */ public void mouseMoved(MouseEvent inEvent) { + boolean useCrosshairs = false; + boolean useResize = false; // Ignore unless we're drawing points if (_drawMode == MODE_DRAW_POINTS_CONT) { @@ -1002,6 +1331,29 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe _dragToY = inEvent.getY(); repaint(); } + else if (_drawMode == MODE_MARK_RECTANGLE) { + useResize = true; + } + else if (_editmodeCheckBox.isSelected() || inEvent.isAltDown() || inEvent.isAltGraphDown()) + { + // Try to find a point or a midpoint at this location, and if there is one + // then change the cursor to crosshairs + final double clickX = _mapPosition.getXFromPixels(inEvent.getX(), getWidth()); + final double clickY = _mapPosition.getYFromPixels(inEvent.getY(), getHeight()); + final double clickSens = _mapPosition.getBoundsFromPixels(CLICK_SENSITIVITY); + useCrosshairs = (_track.getNearestPointIndex(clickX, clickY, clickSens, false) >= 0 + || _midpoints.getNearestPointIndex(clickX, clickY, clickSens) >= 0 + ); + } + if (useCrosshairs && !isCursorSet()) { + setCursor(Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR)); + } + else if (useResize && !isCursorSet()) { + setCursor(Cursor.getPredefinedCursor(Cursor.SE_RESIZE_CURSOR)); + } + else if (!useCrosshairs && !useResize && isCursorSet()) { + setCursor(null); + } } /** @@ -1023,8 +1375,31 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe if ((inUpdateType & DataSubscriber.DATA_ADDED_OR_REMOVED) > 0) { _checkBounds = true; } - if ((inUpdateType & DataSubscriber.MAPSERVER_CHANGED) > 0) { - _tileManager.resetConfig(); + if ((inUpdateType & DataSubscriber.MAPSERVER_CHANGED) > 0) + { + // Get the selected map source index and pass to tile manager + _tileManager.setMapSource(Config.getConfigInt(Config.KEY_MAPSOURCE_INDEX)); + final int wpType = Config.getConfigInt(Config.KEY_WAYPOINT_ICONS); + if (wpType == WpIconLibrary.WAYPT_DEFAULT) + { + _waypointIconDefinition = null; + } + else + { + final int wpSize = Config.getConfigInt(Config.KEY_WAYPOINT_ICON_SIZE); + _waypointIconDefinition = WpIconLibrary.getIconDefinition(wpType, wpSize); + } + } + if ((inUpdateType & (DataSubscriber.DATA_ADDED_OR_REMOVED + DataSubscriber.DATA_EDITED)) > 0) { + _midpoints.updateData(_track); + } + // See if rect mode has been activated + if (_app.getCurrentMode() == App.AppMode.DRAWRECT) + { + _drawMode = MODE_MARK_RECTANGLE; + if (!isCursorSet()) { + setCursor(Cursor.getPredefinedCursor(Cursor.SE_RESIZE_CURSOR)); + } } repaint(); // enable or disable components