X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Ffunction%2Fcompress%2FCompressTrackFunction.java;h=5aa76aa76a1c570c89330fafab5192a329082b8a;hb=4d5796d02a15808311c09448d79e6e7d1de9d636;hp=35ff61da1ea3b73cd7618315d73af34647096a32;hpb=1ee49ae3c8ef3aa2e63eadd458531e5f8bd4f92c;p=GpsPrune.git

diff --git a/tim/prune/function/compress/CompressTrackFunction.java b/tim/prune/function/compress/CompressTrackFunction.java
index 35ff61d..5aa76aa 100644
--- a/tim/prune/function/compress/CompressTrackFunction.java
+++ b/tim/prune/function/compress/CompressTrackFunction.java
@@ -11,6 +11,7 @@ import javax.swing.Box;
 import javax.swing.BoxLayout;
 import javax.swing.JButton;
 import javax.swing.JDialog;
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 
 import tim.prune.App;
@@ -156,7 +157,8 @@ public class CompressTrackFunction extends GenericFunction
 			new DuplicatePointAlgorithm(_track, details, changeListener),
 			new ClosePointsAlgorithm(_track, details, changeListener),
 			new WackyPointAlgorithm(_track, details, changeListener),
-			new SingletonAlgorithm(_track, details, changeListener)
+			new SingletonAlgorithm(_track, details, changeListener),
+			new DouglasPeuckerAlgorithm(_track, details, changeListener)
 		};
 	}
 
@@ -168,14 +170,27 @@ public class CompressTrackFunction extends GenericFunction
 	{
 		boolean[] deleteFlags = preview();
 		// All flags are now combined in deleteFlags array
+		int numMarked = 0;
 		for (int i=0; i<deleteFlags.length; i++)
 		{
 			DataPoint point = _track.getPoint(i);
-			point.setMarkedForDeletion(deleteFlags[i] && point.getPhoto() == null);
+			boolean deletePoint = deleteFlags[i] && !point.hasMedia();
+			point.setMarkedForDeletion(deletePoint);
+			if (deletePoint) numMarked++;
 		}
 
 		// Close dialog and inform listeners
 		UpdateMessageBroker.informSubscribers();
 		_dialog.dispose();
+		// Show confirmation dialog with OK button (not status bar message)
+		if (numMarked > 0) {
+			JOptionPane.showMessageDialog(_parentFrame, I18nManager.getText("dialog.compress.confirm1")
+				+ " " + numMarked + " " + I18nManager.getText("dialog.compress.confirm2"),
+				I18nManager.getText(getNameKey()), JOptionPane.INFORMATION_MESSAGE);
+		}
+		else {
+			JOptionPane.showMessageDialog(_parentFrame, I18nManager.getText("dialog.compress.confirmnone"),
+				I18nManager.getText(getNameKey()), JOptionPane.INFORMATION_MESSAGE);
+		}
 	}
 }