X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fgui%2Fmap%2FMapCanvas.java;h=a62b10855ce14d25299f41e891f1b432999c4aff;hb=326f489e36aa7f235bc19409a57bf4955cd50f24;hp=96ff22367e89d5137e1710c96e104a2911ff80de;hpb=4d5796d02a15808311c09448d79e6e7d1de9d636;p=GpsPrune.git diff --git a/tim/prune/gui/map/MapCanvas.java b/tim/prune/gui/map/MapCanvas.java index 96ff223..a62b108 100644 --- a/tim/prune/gui/map/MapCanvas.java +++ b/tim/prune/gui/map/MapCanvas.java @@ -31,6 +31,7 @@ import javax.swing.JMenuItem; import javax.swing.JPanel; import javax.swing.JPopupMenu; import javax.swing.JSlider; +import javax.swing.SwingUtilities; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; @@ -57,12 +58,13 @@ 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.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; @@ -292,6 +294,8 @@ 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)); } @@ -390,25 +394,7 @@ 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; } @@ -446,7 +432,7 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe 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)); @@ -469,6 +455,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 < 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 @@ -487,8 +512,19 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe 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;} @@ -523,7 +559,7 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe // Loop over layers for (int l=0; l 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()) { @@ -685,19 +729,21 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe 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) < winWidth && nameYs[a] < winHeight && (nameYs[a] - nameHeight) > 0 - && !overlapsPoints(nameXs[a], nameYs[a], nameWidth, nameHeight, textColour)) + && !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]); @@ -813,50 +859,6 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe } } - /** - * 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 - */ - private boolean overlapsPoints(int inX, int inY, int inWidth, int inHeight, Color inTextColour) - { - // 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 - { - // 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;} - } - } - } - catch (NullPointerException e) { - // ignore null pointers, just return false - } - return false; - } - /** * Make a semi-transparent colour for drawing with * @param inColour base colour (fully opaque) @@ -873,22 +875,25 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe * 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(); } /** @@ -906,7 +911,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(); } @@ -1176,7 +1186,7 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe _app.setCurrentMode(App.AppMode.NORMAL); _drawMode = MODE_DEFAULT; // Call a function to mark the points - MarkPointsInRectangleFunction marker = new MarkPointsInRectangleFunction(_app); + 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())); @@ -1306,7 +1316,8 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe _checkBounds = true; } if ((inUpdateType & DataSubscriber.MAPSERVER_CHANGED) > 0) { - _tileManager.resetConfig(); + // Get the selected map source index and pass to tile manager + _tileManager.setMapSource(Config.getConfigInt(Config.KEY_MAPSOURCE_INDEX)); } if ((inUpdateType & (DataSubscriber.DATA_ADDED_OR_REMOVED + DataSubscriber.DATA_EDITED)) > 0) { _midpoints.updateData(_track);