X-Git-Url: https://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=tim%2Fprune%2Fsave%2FImageExporter.java;h=f3383fe33c2b936c001420df545baf482a6e02dd;hp=41bc0e6d0e7f186bc884ad98b080de4b0474bef6;hb=a6197ddcaac11c0b943183da7d46169742d024af;hpb=88f2c3647ed9e055090484f01a959d4581f85e7d

diff --git a/tim/prune/save/ImageExporter.java b/tim/prune/save/ImageExporter.java
index 41bc0e6..f3383fe 100644
--- a/tim/prune/save/ImageExporter.java
+++ b/tim/prune/save/ImageExporter.java
@@ -36,6 +36,7 @@ import tim.prune.data.Track;
 import tim.prune.gui.BaseImageDefinitionPanel;
 import tim.prune.gui.GuiGridLayout;
 import tim.prune.gui.WholeNumberField;
+import tim.prune.gui.colour.PointColourer;
 import tim.prune.gui.map.MapSource;
 import tim.prune.gui.map.MapSourceLibrary;
 import tim.prune.gui.map.MapUtils;
@@ -289,9 +290,11 @@ public class ImageExporter extends GenericFunction implements BaseImageConsumer
 		final int zoomFactor = 1 << _baseImagePanel.getImageDefinition().getZoom();
 		Graphics g = inImage.getImage().getGraphics();
 		// TODO: Set line width, style etc
-		g.setColor(Config.getColourScheme().getColour(ColourScheme.IDX_POINT));
+		final PointColourer pointColourer = _app.getPointColourer();
+		final Color defaultPointColour = Config.getColourScheme().getColour(ColourScheme.IDX_POINT);
+		g.setColor(defaultPointColour);
 
-		// Loop over points
+		// Loop to draw all track points
 		final Track track = _app.getTrackInfo().getTrack();
 		final int numPoints = track.getNumPoints();
 		int prevX = 0, prevY = 0;
@@ -300,6 +303,12 @@ public class ImageExporter extends GenericFunction implements BaseImageConsumer
 			DataPoint point = track.getPoint(i);
 			if (!point.isWaypoint())
 			{
+				// Determine what colour to use to draw the track point
+				if (pointColourer != null)
+				{
+					Color c = pointColourer.getColour(i);
+					g.setColor(c == null ? defaultPointColour : c);
+				}
 				double x = track.getX(i) - xRange.getMinimum();
 				double y = track.getY(i) - yRange.getMinimum();
 				// use zoom level to calculate pixel coords on image
@@ -318,10 +327,11 @@ public class ImageExporter extends GenericFunction implements BaseImageConsumer
 				prevX = px; prevY = py;
 			}
 		}
-		// Draw waypoints
+
+		// Now the waypoints
 		final Color textColour = Config.getColourScheme().getColour(ColourScheme.IDX_TEXT);
 		g.setColor(textColour);
-		// Loop over points
+		// Loop again to draw waypoints
 		for (int i=0; i<numPoints; i++)
 		{
 			DataPoint point = track.getPoint(i);