X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fdata%2FTrack.java;h=df51e8f27e3c8963189b664adefc7534861188ea;hb=54b9d8bc8f0025ccf97a67d9dd217ef1f9cf082f;hp=9c65437b60abc86df5bd803c3f045d946e89a2f5;hpb=ca9bdb3916f9c39adbbf95d06ac95c21dafbb4e6;p=GpsPrune.git diff --git a/tim/prune/data/Track.java b/tim/prune/data/Track.java index 9c65437..df51e8f 100644 --- a/tim/prune/data/Track.java +++ b/tim/prune/data/Track.java @@ -2,9 +2,11 @@ package tim.prune.data; import java.util.List; +import tim.prune.Config; import tim.prune.UpdateMessageBroker; -import tim.prune.edit.FieldEdit; -import tim.prune.edit.FieldEditList; +import tim.prune.function.edit.FieldEdit; +import tim.prune.function.edit.FieldEditList; +import tim.prune.gui.map.MapUtils; /** @@ -50,7 +52,7 @@ public class Track * @param inPointArray 2d object array containing data * @param inAltFormat altitude format */ - public void load(Field[] inFieldArray, Object[][] inPointArray, int inAltFormat) + public void load(Field[] inFieldArray, Object[][] inPointArray, Altitude.Format inAltFormat) { if (inFieldArray == null || inPointArray == null) { @@ -85,6 +87,19 @@ public class Track } + /** + * Load the track by transferring the contents from a loaded Track object + * @param inOther Track object containing loaded data + */ + public void load(Track inOther) + { + _numPoints = inOther._numPoints; + _masterFieldList = inOther._masterFieldList; + _dataPoints = inOther._dataPoints; + // needs to be scaled + _scaled = false; + } + ////////////////// Modification methods ////////////////////// @@ -128,63 +143,22 @@ public class Track /** - * Compress the track to the given resolution - * @param inResolution resolution + * Delete the points marked for deletion * @return number of points deleted */ - public int compress(int inResolution) + public int deleteMarkedPoints() { - // (maybe should be separate thread?) - // (maybe should be in separate class?) - // (maybe should be based on subtended angles instead of distances?) - - if (inResolution <= 0) return 0; int numCopied = 0; - // Establish range of track and minimum range between points - scalePoints(); - double wholeScale = _xRange.getMaximum() - _xRange.getMinimum(); - double yscale = _yRange.getMaximum() - _yRange.getMinimum(); - if (yscale > wholeScale) wholeScale = yscale; - double minDist = wholeScale / inResolution; - - // Keep track of segment start flags of the deleted points - boolean setSegment = false; // Copy selected points DataPoint[] newPointArray = new DataPoint[_numPoints]; - int[] pointIndices = new int[_numPoints]; for (int i=0; i<_numPoints; i++) { DataPoint point = _dataPoints[i]; - boolean keepPoint = true; // Don't delete waypoints or photo points - if (!point.isWaypoint() && point.getPhoto() == null) - { - // go through newPointArray to check for range - for (int j=0; j 0) - { - // Make new resized array and copy DataPoints over - DataPoint[] newPointArray = new DataPoint[_numPoints - numDupes]; - j = 0; - for (i=0; i<_numPoints; i++) - { - if (!dupes[i]) - { - newPointArray[j] = _dataPoints[i]; - j++; - } - } - // Copy array references - _dataPoints = newPointArray; - _numPoints = _dataPoints.length; - _scaled = false; - } - return numDupes; - } - - /** * Reverse the specified range of points * @param inStart start index @@ -363,6 +269,35 @@ public class Track } + /** + * Add the given time offset to the specified range + * @param inStart start of range + * @param inEnd end of range + * @param inOffset offset to add (-ve to subtract) + * @return true on success + */ + public boolean addTimeOffset(int inStart, int inEnd, long inOffset) + { + // sanity check + if (inStart < 0 || inEnd < 0 || inStart >= inEnd || inEnd >= _numPoints) { + return false; + } + boolean foundTimestamp = false; + // Loop over all points within range + for (int i=inStart; i<=inEnd; i++) + { + Timestamp timestamp = _dataPoints[i].getTimestamp(); + if (timestamp != null) + { + // This point has a timestamp so add the offset to it + foundTimestamp = true; + timestamp.addOffset(inOffset); + } + } + return foundTimestamp; + } + + /** * Merge the track segments within the given range * @param inStart start index @@ -501,6 +436,61 @@ public class Track } + /** + * Cut and move the specified section + * @param inSectionStart start index of section + * @param inSectionEnd end index of section + * @param inMoveTo index of move to point + * @return true if move successful + */ + public boolean cutAndMoveSection(int inSectionStart, int inSectionEnd, int inMoveTo) + { + // Check that indices make sense + if (inSectionStart > 0 && inSectionEnd > inSectionStart && inMoveTo > 0 + && (inMoveTo < inSectionStart || inMoveTo > (inSectionEnd+1))) + { + // do the cut and move + DataPoint[] newPointArray = new DataPoint[_numPoints]; + // System.out.println("Cut/move section (" + inSectionStart + " - " + inSectionEnd + ") to before point " + inMoveTo); + // Is it a forward copy or a backward copy? + if (inSectionStart > inMoveTo) + { + int sectionLength = inSectionEnd - inSectionStart + 1; + // move section to earlier point + if (inMoveTo > 0) + System.arraycopy(_dataPoints, 0, newPointArray, 0, inMoveTo); // unchanged points before + System.arraycopy(_dataPoints, inSectionStart, newPointArray, inMoveTo, sectionLength); // moved bit + // after insertion point, before moved bit + if (inSectionStart > (inMoveTo + 1)) + System.arraycopy(_dataPoints, inMoveTo, newPointArray, inMoveTo + sectionLength, inSectionStart - inMoveTo); + // after moved bit + if (inSectionEnd < (_numPoints - 1)) + System.arraycopy(_dataPoints, inSectionEnd+1, newPointArray, inSectionEnd+1, _numPoints - inSectionEnd - 1); + } + else + { + // Move section to later point + if (inSectionStart > 0) + System.arraycopy(_dataPoints, 0, newPointArray, 0, inSectionStart); // unchanged points before + // from end of section to move to point + if (inMoveTo > (inSectionEnd + 1)) + System.arraycopy(_dataPoints, inSectionEnd+1, newPointArray, inSectionStart, inMoveTo - inSectionEnd - 1); + // moved bit + System.arraycopy(_dataPoints, inSectionStart, newPointArray, inSectionStart + inMoveTo - inSectionEnd - 1, + inSectionEnd - inSectionStart + 1); + // unchanged bit after + if (inSectionEnd < (_numPoints - 1)) + System.arraycopy(_dataPoints, inMoveTo, newPointArray, inMoveTo, _numPoints - inMoveTo); + } + // Copy array references + _dataPoints = newPointArray; + _scaled = false; + return true; + } + return false; + } + + /** * Interpolate extra points between two selected ones * @param inStartIndex start index of interpolation @@ -525,6 +515,53 @@ public class Track } + /** + * Average selected points + * @param inStartIndex start index of selection + * @param inEndIndex end index of selection + * @return true if successful + */ + public boolean average(int inStartIndex, int inEndIndex) + { + // check parameters + if (inStartIndex < 0 || inStartIndex >= _numPoints || inEndIndex <= inStartIndex) + return false; + + DataPoint startPoint = getPoint(inStartIndex); + double firstLatitude = startPoint.getLatitude().getDouble(); + double firstLongitude = startPoint.getLongitude().getDouble(); + double latitudeDiff = 0.0, longitudeDiff = 0.0; + double totalAltitude = 0; + int numAltitudes = 0; + Altitude.Format altFormat = Config.getUseMetricUnits()?Altitude.Format.METRES:Altitude.Format.FEET; + // loop between start and end points + for (int i=inStartIndex; i<= inEndIndex; i++) + { + DataPoint currPoint = getPoint(i); + latitudeDiff += (currPoint.getLatitude().getDouble() - firstLatitude); + longitudeDiff += (currPoint.getLongitude().getDouble() - firstLongitude); + if (currPoint.hasAltitude()) { + totalAltitude += currPoint.getAltitude().getValue(altFormat); + numAltitudes++; + } + } + int numPoints = inEndIndex - inStartIndex + 1; + double meanLatitude = firstLatitude + (latitudeDiff / numPoints); + double meanLongitude = firstLongitude + (longitudeDiff / numPoints); + Altitude meanAltitude = null; + if (numAltitudes > 0) {meanAltitude = new Altitude((int) (totalAltitude / numAltitudes), altFormat);} + + DataPoint insertedPoint = new DataPoint(new Latitude(meanLatitude, Coordinate.FORMAT_NONE), + new Longitude(meanLongitude, Coordinate.FORMAT_NONE), meanAltitude); + // Make into singleton + insertedPoint.setSegmentStart(true); + DataPoint nextPoint = getNextTrackPoint(inEndIndex+1); + if (nextPoint != null) {nextPoint.setSegmentStart(true);} + // Insert points into track + return insertRange(new DataPoint[] {insertedPoint}, inEndIndex + 1); + } + + /** * Append the specified points to the end of the track * @param inPoints DataPoint objects to add @@ -660,11 +697,17 @@ public class Track */ public boolean hasData(Field inField, int inStart, int inEnd) { + // Loop over selected point range for (int i=inStart; i<=inEnd; i++) { if (_dataPoints[i].getFieldValue(inField) != null) { - return true; + // Check altitudes and timestamps + if ((inField != Field.ALTITUDE || _dataPoints[i].getAltitude().isValid()) + && (inField != Field.TIMESTAMP || _dataPoints[i].getTimestamp().isValid())) + { + return true; + } } } return false; @@ -680,12 +723,41 @@ public class Track return _mixedData; } + /** + * @return true if track contains any points marked for deletion + */ + public boolean hasMarkedPoints() + { + if (_numPoints < 1) { + return false; + } + // Loop over points looking for any marked for deletion + for (int i=0; i<=_numPoints-1; i++) + { + if (_dataPoints[i] != null && _dataPoints[i].getDeleteFlag()) { + return true; + } + } + // None found + return false; + } + + /** + * Clear all the deletion markers + */ + public void clearDeletionMarkers() + { + for (int i=0; i<_numPoints; i++) + { + _dataPoints[i].setMarkedForDeletion(false); + } + } /** * Collect all the waypoints into the given List * @param inList List to fill with waypoints */ - public void getWaypoints(List inList) + public void getWaypoints(List inList) { // clear list inList.clear(); @@ -757,11 +829,6 @@ public class Track } _mixedData = hasWaypoint && hasTrackpoint; - // Use medians to centre at 0 - double longMedian = (_longRange.getMaximum() + _longRange.getMinimum()) / 2.0; - double latMedian = (_latRange.getMaximum() + _latRange.getMinimum()) / 2.0; - double longFactor = Math.cos(latMedian / 180.0 * Math.PI); // Function of median latitude - // Loop over points and calculate scales _xValues = new double[getNumPoints()]; _yValues = new double[getNumPoints()]; @@ -772,9 +839,9 @@ public class Track DataPoint point = getPoint(p); if (point != null) { - _xValues[p] = (point.getLongitude().getDouble() - longMedian) * longFactor; + _xValues[p] = MapUtils.getXFromLongitude(point.getLongitude().getDouble()); _xRange.addValue(_xValues[p]); - _yValues[p] = (point.getLatitude().getDouble() - latMedian); + _yValues[p] = MapUtils.getYFromLatitude(point.getLatitude().getDouble()); _yRange.addValue(_yValues[p]); } } @@ -816,7 +883,6 @@ public class Track return nearestPoint; } - /** * Get the next track point starting from the given index * @param inStartIndex index to start looking from @@ -824,7 +890,18 @@ public class Track */ public DataPoint getNextTrackPoint(int inStartIndex) { - return getNextTrackPoint(inStartIndex, 1); + return getNextTrackPoint(inStartIndex, _numPoints, true); + } + + /** + * Get the next track point in the given range + * @param inStartIndex index to start looking from + * @param inEndIndex index to stop looking + * @return next track point, or null if end of data reached + */ + public DataPoint getNextTrackPoint(int inStartIndex, int inEndIndex) + { + return getNextTrackPoint(inStartIndex, inEndIndex, true); } /** @@ -834,19 +911,21 @@ public class Track */ public DataPoint getPreviousTrackPoint(int inStartIndex) { - return getNextTrackPoint(inStartIndex, -1); + return getNextTrackPoint(inStartIndex, _numPoints, false); } /** * Get the next track point starting from the given index * @param inStartIndex index to start looking from - * @param inIncrement increment to add to point index, +1 for next, -1 for previous + * @param inEndIndex index to stop looking (inclusive) + * @param inCountUp true for next, false for previous * @return next track point, or null if end of data reached */ - private DataPoint getNextTrackPoint(int inStartIndex, int inIncrement) + private DataPoint getNextTrackPoint(int inStartIndex, int inEndIndex, boolean inCountUp) { // Loop forever over points - for (int i=inStartIndex; ; i+=inIncrement) + int increment = inCountUp?1:-1; + for (int i=inStartIndex; i<=inEndIndex; i+=increment) { DataPoint point = getPoint(i); // Exit if end of data reached - there wasn't a track point @@ -856,6 +935,7 @@ public class Track return point; } } + return null; } /** @@ -1027,7 +1107,7 @@ public class Track // set photo status if coordinates have changed if (inPoint.getPhoto() != null && coordsChanged) { - inPoint.getPhoto().setCurrentStatus(PhotoStatus.CONNECTED); + inPoint.getPhoto().setCurrentStatus(Photo.Status.CONNECTED); } // point possibly needs to be scaled again _scaled = false;