X-Git-Url: https://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fcorrelate%2FPhotoCorrelator.java;h=ccf5345103826ee2fb05f9e9b9253562835e2ab2;hb=52bf9e8686c916be37a26a0b75340393d4478b05;hp=22237725c8daef673d99a7446f137054b65e559b;hpb=da0b1f449260a0b4a94318006382a9039726ef3e;p=GpsPrune.git

diff --git a/tim/prune/correlate/PhotoCorrelator.java b/tim/prune/correlate/PhotoCorrelator.java
index 2223772..ccf5345 100644
--- a/tim/prune/correlate/PhotoCorrelator.java
+++ b/tim/prune/correlate/PhotoCorrelator.java
@@ -427,10 +427,9 @@ public class PhotoCorrelator
 				long numSecs = pair.getMinSeconds();
 				correlatePhoto = (numSecs <= timeLimit.getTotalSeconds());
 			}
-			if (angDistLimit > 0.0 && correlatePhoto) {
+			if (angDistLimit > 0.0 && correlatePhoto)
+			{
 				final double angDistPair = DataPoint.calculateRadiansBetween(pair.getPointBefore(), pair.getPointAfter());
-				//System.out.println("(dist between pair is " + angDistPair + ") which means "
-				//	+ Distance.convertRadiansToDistance(angDistPair, Distance.UNITS_METRES) + "m");
 				double frac = pair.getFraction();
 				if (frac > 0.5) {frac = 1 - frac;}
 				final double angDistPhoto = angDistPair * frac;
@@ -537,8 +536,8 @@ public class PhotoCorrelator
 	private static PointPair getPointPairForPhoto(Track inTrack, Photo inPhoto, TimeDifference inOffset)
 	{
 		PointPair pair = new PointPair(inPhoto);
-		// Add offet to photo timestamp
-		Timestamp photoStamp = inPhoto.getTimestamp().subtractOffset(inOffset);
+		// Add/subtract offet to photo timestamp
+		Timestamp photoStamp = inPhoto.getTimestamp().createMinusOffset(inOffset);
 		int numPoints = inTrack.getNumPoints();
 		for (int i=0; i<numPoints; i++)
 		{
@@ -613,7 +612,6 @@ public class PhotoCorrelator
 		{
 			PhotoSelectionTableRow row = inModel.getRow(i);
 			set.add(new TimeIndexPair(row.getTimeDiff().getTotalSeconds(), i));
-			//System.out.println("pair " + i + " has time " + row.getTimeDiff().getTotalSeconds());
 		}
 		// pull out middle entry and return index
 		TimeIndexPair pair = null;
@@ -621,7 +619,6 @@ public class PhotoCorrelator
 		for (i=0; i<(numRows+1)/2; i++)
 		{
 			pair = (TimeIndexPair) iterator.next();
-			//System.out.println("After sorting, pair " + i + " has index " + pair.getIndex());
 		}
 		return pair.getIndex();
 	}
@@ -632,8 +629,7 @@ public class PhotoCorrelator
 	 */
 	public void disableOkButton()
 	{
-		if (_okButton != null)
-		{
+		if (_okButton != null) {
 			_okButton.setEnabled(false);
 		}
 	}