package tim.prune.gui.map;
-import java.awt.AlphaComposite;
-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;
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;
/** 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 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;
_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);
makePopup();
// Get currently selected map from Config, pass to MapTileManager
_tileManager.setMapSource(Config.getConfigInt(Config.KEY_MAPSOURCE_INDEX));
+ // Update display settings
+ dataUpdated(MAPSERVER_CHANGED);
}
}
// Draw the map contents if necessary
- if ((_mapImage == null || _recalculate))
+ if (_mapImage == null || _recalculate)
{
paintMapContents();
_scaleBar.updateScale(_mapPosition.getZoom(), _mapPosition.getYFromPixels(0, 0));
_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());
if (trackOpacity > 0.0f)
{
// Paint the track points on top
- int pointsPainted = 1;
+ boolean pointsPainted = true;
try
{
if (trackOpacity > 0.9f)
catch (ArrayIndexOutOfBoundsException obe) {} // also ignore
// Zoom to fit if no points found
- if (pointsPainted <= 0 && _checkBounds)
+ if (!pointsPainted && _checkBounds)
{
zoomToFit();
_recalculate = true;
/**
* 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[] 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)
{
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<numPoints; i++)
{
// Calculate pixel position of point from its x, y coordinates
anyWaypoints = anyWaypoints || isWaypoint;
if (!isWaypoint)
{
- if (currPointVisible || prevPointVisible)
+ if (currPointVisible || (drawLines && prevPointVisible))
{
// For track points, work out which colour to use
if (_track.getPoint(i).getDeleteFlag()) {
// Draw rectangle for track point if it's visible
if (currPointVisible)
{
- inG.drawRect(px-2, py-2, 3, 3);
- pointsPainted++;
+ if (drawPoints) {
+ inG.drawRect(px-2, py-2, 3, 3);
+ }
+ pointsPainted = true;
}
}
// Connect track points if either of them are visible
- if (connectPoints && !(prevX == -1 && prevY == -1)
+ 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;
}
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++;
}
}
{
inG.drawRect(px-1, py-1, 2, 2);
inG.drawRect(px-2, py-2, 4, 4);
- pointsPainted++;
+ pointsPainted = true;
}
}
}
{
if (_track != null && _track.getNumPoints() > 0)
{
- // select point if it's a left-click
+ // select point if it's a left-click
if (!inE.isMetaDown())
{
if (inE.getClickCount() == 1)
*/
public void mouseDragged(MouseEvent inE)
{
- if (!inE.isMetaDown())
+ // Note: One would expect inE.isMetaDown() to give information about whether this is a
+ // drag with the right mouse button or not - but since java 9 this is buggy,
+ // so we use the beautifully-named getModifiersEx() instead.
+ // And logically BUTTON3 refers to the secondary mouse button, not the tertiary one!
+ final boolean isRightDrag = (inE.getModifiersEx() & InputEvent.BUTTON3_DOWN_MASK) > 0;
+ if (isRightDrag)
{
- // Left mouse drag - either drag the point or pan the map
+ // Right-click and drag - update rectangle
+ _drawMode = MODE_ZOOM_RECT;
+ if (_dragFromX == -1) {
+ _dragFromX = inE.getX();
+ _dragFromY = inE.getY();
+ }
+ _dragToX = inE.getX();
+ _dragToY = inE.getY();
+ repaint();
+ }
+ else
+ {
+ // Left mouse drag - decide whether to drag the point, drag the
+ // marking rectangle or pan the map
if (_drawMode == MODE_DRAG_POINT || _drawMode == MODE_CREATE_MIDPOINT)
{
// move point
_dragFromY = _dragToY = inE.getY();
}
}
- else
- {
- // Right-click and drag - update rectangle
- _drawMode = MODE_ZOOM_RECT;
- if (_dragFromX == -1) {
- _dragFromX = inE.getX();
- _dragFromY = inE.getY();
- }
- _dragToX = inE.getX();
- _dragToY = inE.getY();
- repaint();
- }
}
/**
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);