X-Git-Url: https://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fdata%2FDataPoint.java;h=84f4800bcd2c0a0d546da8a83a87868810bf3a54;hb=92dad5df664287acb51728e9ea599f150765d34a;hp=e053e1ad14405add6a237b4e748884c8575fe3c4;hpb=f35b6d628f68e3b5ef19965ad8988d0dd1eb8efa;p=GpsPrune.git diff --git a/tim/prune/data/DataPoint.java b/tim/prune/data/DataPoint.java index e053e1a..84f4800 100644 --- a/tim/prune/data/DataPoint.java +++ b/tim/prune/data/DataPoint.java @@ -15,52 +15,73 @@ public class DataPoint private FieldList _fieldList = null; /** Special fields for coordinates */ private Coordinate _latitude = null, _longitude = null; - private Altitude _altitude; + private Altitude _altitude = null; + private Speed _hSpeed = null, _vSpeed = null; private Timestamp _timestamp = null; /** Attached photo */ private Photo _photo = null; - /** Attached audio file */ - private AudioFile _audio = null; + /** Attached audio clip */ + private AudioClip _audio = null; private String _waypointName = null; private boolean _startOfSegment = false; private boolean _markedForDeletion = false; private int _modifyCount = 0; + /** * Constructor * @param inValueArray array of String values * @param inFieldList list of fields - * @param inAltFormat altitude format + * @param inOptions creation options such as units */ - public DataPoint(String[] inValueArray, FieldList inFieldList, Altitude.Format inAltFormat) + public DataPoint(String[] inValueArray, FieldList inFieldList, PointCreateOptions inOptions) { // save data _fieldValues = inValueArray; // save list of fields _fieldList = inFieldList; + // Remove double quotes around values + removeQuotes(_fieldValues); // parse fields into objects - parseFields(null, inAltFormat); + parseFields(null, inOptions); } /** * Parse the string values into objects eg Coordinates * @param inField field which has changed, or null for all - * @param inAltFormat altitude format + * @param inOptions creation options such as units */ - private void parseFields(Field inField, Altitude.Format inAltFormat) + private void parseFields(Field inField, PointCreateOptions inOptions) { + if (inOptions == null) inOptions = new PointCreateOptions(); if (inField == null || inField == Field.LATITUDE) { _latitude = new Latitude(getFieldValue(Field.LATITUDE)); } if (inField == null || inField == Field.LONGITUDE) { _longitude = new Longitude(getFieldValue(Field.LONGITUDE)); } - if (inField == null || inField == Field.ALTITUDE) { - _altitude = new Altitude(getFieldValue(Field.ALTITUDE), inAltFormat); + if (inField == null || inField == Field.ALTITUDE) + { + Unit altUnit = inOptions.getAltitudeUnits(); + if (_altitude != null && _altitude.getUnit() != null) { + altUnit = _altitude.getUnit(); + } + _altitude = new Altitude(getFieldValue(Field.ALTITUDE), altUnit); + } + if (inField == null || inField == Field.SPEED) + { + _hSpeed = new Speed(getFieldValue(Field.SPEED), inOptions.getSpeedUnits()); + } + if (inField == null || inField == Field.VERTICAL_SPEED) + { + _vSpeed = new Speed(getFieldValue(Field.VERTICAL_SPEED), inOptions.getVerticalSpeedUnits()); + if (!inOptions.getVerticalSpeedsUpwards()) { + _vSpeed.invert(); + } } if (inField == null || inField == Field.TIMESTAMP) { - _timestamp = new Timestamp(getFieldValue(Field.TIMESTAMP)); + _timestamp = new TimestampUtc(getFieldValue(Field.TIMESTAMP)); } if (inField == null || inField == Field.WAYPT_NAME) { _waypointName = getFieldValue(Field.WAYPT_NAME); @@ -97,7 +118,7 @@ public class DataPoint _altitude = inAltitude; _fieldValues[2] = "" + inAltitude.getValue(); } - _timestamp = new Timestamp(null); + _timestamp = new TimestampUtc(null); } @@ -117,7 +138,7 @@ public class DataPoint * @param inIndex index number starting at zero * @return field value, or null if not found */ - public String getFieldValue(int inIndex) + private String getFieldValue(int inIndex) { if (_fieldValues == null || inIndex < 0 || inIndex >= _fieldValues.length) return null; @@ -158,13 +179,13 @@ public class DataPoint setModified(inUndo); } // Change Coordinate, Altitude, Name or Timestamp fields after edit - if (_altitude != null && _altitude.getFormat() != Altitude.Format.NO_FORMAT) { + if (_altitude != null && _altitude.getUnit() != null) { // Altitude already present so reuse format - parseFields(inField, _altitude.getFormat()); + parseFields(inField, null); // current units will be used } else { // use default altitude format from config - parseFields(inField, Config.getConfigBoolean(Config.KEY_METRIC_UNITS)?Altitude.Format.METRES:Altitude.Format.FEET); + parseFields(inField, Config.getUnitSet().getDefaultOptions()); } } @@ -217,13 +238,33 @@ public class DataPoint /** @return true if point has altitude */ public boolean hasAltitude() { - return _altitude.isValid(); + return _altitude != null && _altitude.isValid(); } /** @return altitude */ public Altitude getAltitude() { return _altitude; } + /** @return true if point has horizontal speed (loaded as field) */ + public boolean hasHSpeed() + { + return _hSpeed != null && _hSpeed.isValid(); + } + /** @return horizontal speed */ + public Speed getHSpeed() + { + return _hSpeed; + } + /** @return true if point has vertical speed (loaded as field) */ + public boolean hasVSpeed() + { + return _vSpeed != null && _vSpeed.isValid(); + } + /** @return vertical speed */ + public Speed getVSpeed() + { + return _vSpeed; + } /** @return true if point has timestamp */ public boolean hasTimestamp() { @@ -297,6 +338,46 @@ public class DataPoint return (inOther._waypointName != null && inOther._waypointName.equals(_waypointName)); } + /** + * Add an altitude offset to this point, and keep the point's string value in sync + * @param inOffset offset as double + * @param inUnit unit of offset, feet or metres + * @param inDecimals number of decimal places + */ + public void addAltitudeOffset(double inOffset, Unit inUnit, int inDecimals) + { + if (hasAltitude()) + { + _altitude.addOffset(inOffset, inUnit, inDecimals); + _fieldValues[_fieldList.getFieldIndex(Field.ALTITUDE)] = _altitude.getStringValue(null); + setModified(false); + } + } + + /** + * Reset the altitude to the previous value (by an undo) + * @param inClone altitude object cloned from earlier + */ + public void resetAltitude(Altitude inClone) + { + _altitude.reset(inClone); + _fieldValues[_fieldList.getFieldIndex(Field.ALTITUDE)] = _altitude.getStringValue(null); + setModified(true); + } + + /** + * Add a time offset to this point + * @param inOffset offset to add (-ve to subtract) + */ + public void addTimeOffsetSeconds(long inOffset) + { + if (hasTimestamp()) + { + _timestamp.addOffsetSeconds(inOffset); + _fieldValues[_fieldList.getFieldIndex(Field.TIMESTAMP)] = _timestamp.getText(null); + setModified(false); + } + } /** * Set the photo for this data point @@ -315,10 +396,10 @@ public class DataPoint } /** - * Set the audio file for this point + * Set the audio clip for this point * @param inAudio audio object */ - public void setAudio(AudioFile inAudio) { + public void setAudio(AudioClip inAudio) { _audio = inAudio; _modifyCount++; } @@ -326,23 +407,23 @@ public class DataPoint /** * @return associated audio object */ - public AudioFile getAudio() { + public AudioClip getAudio() { return _audio; } /** * Attach the given media object according to type - * @param inMedia either a photo or an audio file + * @param inMedia either a photo or an audio clip */ - public void attachMedia(MediaFile inMedia) + public void attachMedia(MediaObject inMedia) { if (inMedia != null) { if (inMedia instanceof Photo) { setPhoto((Photo) inMedia); inMedia.setDataPoint(this); } - else if (inMedia instanceof AudioFile) { - setAudio((AudioFile) inMedia); + else if (inMedia instanceof AudioClip) { + setAudio((AudioClip) inMedia); inMedia.setDataPoint(this); } } @@ -363,6 +444,25 @@ public class DataPoint return _photo != null || _audio != null; } + /** + * @return name of attached photo and/or audio + */ + public String getMediaName() + { + String mediaName = null; + if (_photo != null) mediaName = _photo.getName(); + if (_audio != null) + { + if (mediaName == null) { + mediaName = _audio.getName(); + } + else { + mediaName = mediaName + ", " + _audio.getName(); + } + } + return mediaName; + } + /** * Interpolate a set of points between this one and the given one * @param inEndPoint end point of interpolation @@ -451,12 +551,59 @@ public class DataPoint // Copy all values (note that photo not copied) String[] valuesCopy = new String[_fieldValues.length]; System.arraycopy(_fieldValues, 0, valuesCopy, 0, _fieldValues.length); + + PointCreateOptions options = new PointCreateOptions(); + if (_altitude != null) { + options.setAltitudeUnits(_altitude.getUnit()); + } // Make new object to hold cloned data - DataPoint point = new DataPoint(valuesCopy, _fieldList, _altitude.getFormat()); + DataPoint point = new DataPoint(valuesCopy, _fieldList, options); + // Copy the speed information + if (hasHSpeed()) { + point.getHSpeed().copyFrom(_hSpeed); + } + if (hasVSpeed()) { + point.getVSpeed().copyFrom(_vSpeed); + } return point; } + /** + * Remove all single and double quotes surrounding each value + * @param inValues array of values + */ + private static void removeQuotes(String[] inValues) + { + if (inValues == null) {return;} + for (int i=0; i