X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fgui%2Fmap%2FMapCanvas.java;h=801adbb0137e61575d7d00d5468a4e115425c867;hb=92dad5df664287acb51728e9ea599f150765d34a;hp=a62b10855ce14d25299f41e891f1b432999c4aff;hpb=326f489e36aa7f235bc19409a57bf4955cd50f24;p=GpsPrune.git diff --git a/tim/prune/gui/map/MapCanvas.java b/tim/prune/gui/map/MapCanvas.java index a62b108..801adbb 100644 --- a/tim/prune/gui/map/MapCanvas.java +++ b/tim/prune/gui/map/MapCanvas.java @@ -1,37 +1,10 @@ package tim.prune.gui.map; -import java.awt.BasicStroke; -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Cursor; -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.SwingUtilities; +import javax.swing.*; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; @@ -42,22 +15,13 @@ 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.Field; -import tim.prune.data.FieldList; -import tim.prune.data.Latitude; -import tim.prune.data.Longitude; -import tim.prune.data.MidpointData; -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; /** @@ -84,6 +48,8 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe 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 */ @@ -93,7 +59,7 @@ 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 */ @@ -122,6 +88,8 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe 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; @@ -237,8 +205,12 @@ 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); @@ -296,6 +268,8 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe makePopup(); // Get currently selected map from Config, pass to MapTileManager _tileManager.setMapSource(Config.getConfigInt(Config.KEY_MAPSOURCE_INDEX)); + // Update display settings + dataUpdated(MAPSERVER_CHANGED); } @@ -400,7 +374,7 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe } // Draw the map contents if necessary - if ((_mapImage == null || _recalculate)) + if (_mapImage == null || _recalculate) { paintMapContents(); _scaleBar.updateScale(_mapPosition.getZoom(), _mapPosition.getYFromPixels(0, 0)); @@ -484,7 +458,7 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe else if (px > (getWidth()-PAN_DISTANCE)) { panX = AUTOPAN_DISTANCE + px - getWidth(); } - if (py < PAN_DISTANCE) { + if (py < (2*PAN_DISTANCE)) { panY = py - AUTOPAN_DISTANCE; } if (py > (getHeight()-PAN_DISTANCE)) { @@ -505,8 +479,10 @@ 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()); @@ -580,24 +556,58 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe } } - // Paint the track points on top - int pointsPainted = 1; - try + // Work out track opacity according to slider + final float[] opacities = {1.0f, 0.75f, 0.5f, 0.3f, 0.15f, 0.0f}; + float trackOpacity = 1.0f; + if (_transparencySlider.getValue() < 0) { + trackOpacity = opacities[-1 - _transparencySlider.getValue()]; + } + + if (trackOpacity > 0.0f) { - pointsPainted = paintPoints(g); + // 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(); + } } - catch (NullPointerException npe) {} // ignore, probably due to data being changed during drawing - catch (ArrayIndexOutOfBoundsException obe) {} // also ignore // 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); @@ -607,21 +617,18 @@ 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(); @@ -632,6 +639,9 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe 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) { @@ -639,14 +649,20 @@ 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; + boolean drawnLastArrow = false; // avoid painting arrows on adjacent lines, looks too busy for (int i=0; i= 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; } @@ -703,8 +764,20 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe 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++; } } @@ -768,7 +841,7 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe { inG.drawRect(px-1, py-1, 2, 2); inG.drawRect(px-2, py-2, 4, 4); - pointsPainted++; + pointsPainted = true; } } } @@ -859,18 +932,6 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe } } - /** - * 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 - */ - private static Color makeTransparentColour(Color inColour, int inOpacity) - { - if (inOpacity > 240) return inColour; - return new Color(inColour.getRed(), inColour.getGreen(), inColour.getBlue(), inOpacity); - } - /** * Inform that tiles have been updated and the map can be repainted * @param inIsOk true if data loaded ok, false for error @@ -1050,8 +1111,7 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe else if (_drawMode == MODE_DRAW_POINTS_CONT) { DataPoint point = createPointFromClick(inE.getX(), inE.getY()); - _app.createPoint(point); - point.setSegmentStart(false); + _app.createPoint(point, false); // not a new segment } } else if (inE.getClickCount() == 2) @@ -1315,9 +1375,20 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe if ((inUpdateType & DataSubscriber.DATA_ADDED_OR_REMOVED) > 0) { _checkBounds = true; } - if ((inUpdateType & DataSubscriber.MAPSERVER_CHANGED) > 0) { + 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);