Version 4, January 2008

[GpsPrune.git] / tim / prune / data / Selection.java

diff --git a/tim/prune/data/Selection.java b/tim/prune/data/Selection.java
index c375e820b4a05b022682deef2b675ee27a82b8d8..b26c11ff7bbca551bbc4f6574dc4123259512fc0 100644 (file)
--- a/tim/prune/data/Selection.java
+++ b/tim/prune/data/Selection.java
@@ -1,5 +1,6 @@
 package tim.prune.data;
 
+import tim.prune.DataSubscriber;
 import tim.prune.UpdateMessageBroker;
 
 /**
@@ -13,6 +14,7 @@ public class Selection
        private int _currentPoint = -1;
        private boolean _valid = false;
        private int _startIndex = -1, _endIndex = -1;
+       private int _currentPhotoIndex = -1;
        private IntegerRange _altitudeRange = null;
        private int _climb = -1, _descent = -1;
        private int _altitudeFormat = Altitude.FORMAT_NONE;
@@ -242,12 +244,12 @@ public class Selection
 
 
        /**
-        * @param inFormat distance units to use, from class Distance
+        * @param inUnits distance units to use, from class Distance
         * @return distance of Selection in specified units
         */
        public double getDistance(int inUnits)
        {
-               return Distance.convertRadians(_angDistance, inUnits);
+               return Distance.convertRadiansToDistance(_angDistance, inUnits);
        }
 
 
@@ -258,6 +260,7 @@ public class Selection
        {
                _currentPoint = -1;
                deselectRange();
+               deselectPhoto();
        }
 
 
@@ -377,28 +380,76 @@ public class Selection
        }
 
 
+       /**
+        * Deselect photo
+        */
+       public void deselectPhoto()
+       {
+               _currentPhotoIndex = -1;
+               check();
+       }
+
+
+       /**
+        * Select the specified photo and point
+        * @param inPhotoIndex index of selected photo in PhotoList
+        * @param inPointIndex index of selected point
+        */
+       public void selectPhotoAndPoint(int inPhotoIndex, int inPointIndex)
+       {
+               _currentPhotoIndex = inPhotoIndex;
+               if (inPointIndex > -1)
+               {
+                       // select associated point, if any
+                       selectPoint(inPointIndex);
+               }
+               else
+               {
+                       // Check if not already done
+                       check();
+               }
+       }
+
+
+       /**
+        * @return currently selected photo index
+        */
+       public int getCurrentPhotoIndex()
+       {
+               return _currentPhotoIndex;
+       }
+
+
        /**
         * Check that the selection still makes sense
         * and fire update message to listeners
         */
        private void check()
        {
-               if (_track != null && _track.getNumPoints() > 0)
+               if (_track != null)
                {
-                       int maxIndex = _track.getNumPoints() - 1;
-                       if (_currentPoint > maxIndex)
-                       {
-                               _currentPoint = maxIndex;
-                       }
-                       if (_endIndex > maxIndex)
+                       if (_track.getNumPoints() > 0)
                        {
-                               _endIndex = maxIndex;
+                               int maxIndex = _track.getNumPoints() - 1;
+                               if (_currentPoint > maxIndex)
+                               {
+                                       _currentPoint = maxIndex;
+                               }
+                               if (_endIndex > maxIndex)
+                               {
+                                       _endIndex = maxIndex;
+                               }
+                               if (_startIndex > maxIndex)
+                               {
+                                       _startIndex = maxIndex;
+                               }
                        }
-                       if (_startIndex > maxIndex)
+                       else
                        {
-                               _startIndex = maxIndex;
+                               // track is empty, clear selections
+                               _currentPoint = _startIndex = _endIndex = -1;
                        }
                }
-               _broker.informSubscribers();
+               _broker.informSubscribers(DataSubscriber.SELECTION_CHANGED);
        }
 }