X-Git-Url: https://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=tim%2Fprune%2Fdata%2FDataPoint.java;h=34d7bd72055275f81339e1fe23c434d2008603c6;hp=4cf7c827952a8c10c8c46adb5602e4fcbbf3d956;hb=4d5796d02a15808311c09448d79e6e7d1de9d636;hpb=52bf9e8686c916be37a26a0b75340393d4478b05 diff --git a/tim/prune/data/DataPoint.java b/tim/prune/data/DataPoint.java index 4cf7c82..34d7bd7 100644 --- a/tim/prune/data/DataPoint.java +++ b/tim/prune/data/DataPoint.java @@ -1,5 +1,7 @@ package tim.prune.data; +import tim.prune.config.Config; + /** * Class to represent a single data point in the series * including all its fields @@ -15,10 +17,14 @@ public class DataPoint private Coordinate _latitude = null, _longitude = null; private Altitude _altitude; private Timestamp _timestamp = null; + /** Attached photo */ private Photo _photo = 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 @@ -26,31 +32,47 @@ public class DataPoint * @param inFieldList list of fields * @param inAltFormat altitude format */ - public DataPoint(String[] inValueArray, FieldList inFieldList, int inAltFormat) + public DataPoint(String[] inValueArray, FieldList inFieldList, Altitude.Format inAltFormat) { // save data _fieldValues = inValueArray; // save list of fields _fieldList = inFieldList; + // Remove double quotes around values + removeQuotes(_fieldValues); // parse fields into objects - parseFields(inAltFormat); + parseFields(null, inAltFormat); } /** * Parse the string values into objects eg Coordinates + * @param inField field which has changed, or null for all * @param inAltFormat altitude format */ - private void parseFields(int inAltFormat) + private void parseFields(Field inField, Altitude.Format inAltFormat) { - _latitude = new Latitude(getFieldValue(Field.LATITUDE)); - _longitude = new Longitude(getFieldValue(Field.LONGITUDE)); - _altitude = new Altitude(getFieldValue(Field.ALTITUDE), inAltFormat); - _timestamp = new Timestamp(getFieldValue(Field.TIMESTAMP)); - _waypointName = getFieldValue(Field.WAYPT_NAME); - String segmentStr = getFieldValue(Field.NEW_SEGMENT); - if (segmentStr != null) {segmentStr = segmentStr.trim();} - _startOfSegment = (segmentStr != null && (segmentStr.equals("1") || segmentStr.toUpperCase().equals("Y"))); + 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.TIMESTAMP) { + _timestamp = new Timestamp(getFieldValue(Field.TIMESTAMP)); + } + if (inField == null || inField == Field.WAYPT_NAME) { + _waypointName = getFieldValue(Field.WAYPT_NAME); + } + if (inField == null || inField == Field.NEW_SEGMENT) + { + String segmentStr = getFieldValue(Field.NEW_SEGMENT); + if (segmentStr != null) {segmentStr = segmentStr.trim();} + _startOfSegment = (segmentStr != null && (segmentStr.equals("1") || segmentStr.toUpperCase().equals("Y"))); + } } @@ -67,15 +89,15 @@ public class DataPoint Field[] fields = {Field.LATITUDE, Field.LONGITUDE, Field.ALTITUDE}; _fieldList = new FieldList(fields); _latitude = inLatitude; - _fieldValues[0] = inLatitude.output(Coordinate.FORMAT_DEG_MIN_SEC); + _fieldValues[0] = inLatitude.output(Coordinate.FORMAT_NONE); _longitude = inLongitude; - _fieldValues[1] = inLongitude.output(Coordinate.FORMAT_DEG_MIN_SEC); + _fieldValues[1] = inLongitude.output(Coordinate.FORMAT_NONE); if (inAltitude == null) { _altitude = Altitude.NONE; } else { _altitude = inAltitude; - _fieldValues[2] = "" + inAltitude.getValue(Altitude.FORMAT_METRES); // units are ignored + _fieldValues[2] = "" + inAltitude.getValue(); } _timestamp = new Timestamp(null); } @@ -109,8 +131,9 @@ public class DataPoint * Set (or edit) the specified field value * @param inField Field to set * @param inValue value to set + * @param inUndo true if undo operation, false otherwise */ - public void setFieldValue(Field inField, String inValue) + public void setFieldValue(Field inField, String inValue, boolean inUndo) { // See if this data point already has this field int fieldIndex = _fieldList.getFieldIndex(inField); @@ -132,22 +155,55 @@ public class DataPoint } // Set field value in array _fieldValues[fieldIndex] = inValue; + // Increment edit count on all field edits except segment + if (inField != Field.NEW_SEGMENT) { + setModified(inUndo); + } // Change Coordinate, Altitude, Name or Timestamp fields after edit - if (_altitude != null) - { - parseFields(_altitude.getFormat()); + if (_altitude != null && _altitude.getFormat() != Altitude.Format.NO_FORMAT) { + // Altitude already present so reuse format + parseFields(inField, _altitude.getFormat()); } - else - { - // use default altitude format of metres - parseFields(Altitude.FORMAT_METRES); + else { + // use default altitude format from config + parseFields(inField, Config.getUnitSet().getDefaultAltitudeFormat()); } } + /** + * Either increment or decrement the modify count, depending on whether it's an undo or not + * @param inUndo true for undo, false otherwise + */ + public void setModified(boolean inUndo) + { + if (!inUndo) { + _modifyCount++; + } + else { + _modifyCount--; + } + } + + /** + * @return field list for this point + */ + public FieldList getFieldList() + { + return _fieldList; + } + /** @param inFlag true for start of track segment */ public void setSegmentStart(boolean inFlag) { - setFieldValue(Field.NEW_SEGMENT, inFlag?"1":null); + setFieldValue(Field.NEW_SEGMENT, inFlag?"1":null, false); + } + + /** + * Mark the point for deletion + * @param inFlag true to delete, false to keep + */ + public void setMarkedForDeletion(boolean inFlag) { + _markedForDeletion = inFlag; } /** @return latitude */ @@ -192,6 +248,12 @@ public class DataPoint return _startOfSegment; } + /** @return true if point marked for deletion */ + public boolean getDeleteFlag() + { + return _markedForDeletion; + } + /** * @return true if point has a waypoint name */ @@ -200,6 +262,13 @@ public class DataPoint return (_waypointName != null && !_waypointName.equals("")); } + /** + * @return true if point has been modified since loading + */ + public boolean isModified() + { + return _modifyCount > 0; + } /** * Compare two DataPoint objects to see if they are duplicates @@ -235,20 +304,51 @@ public class DataPoint * Set the photo for this data point * @param inPhoto Photo object */ - public void setPhoto(Photo inPhoto) - { + public void setPhoto(Photo inPhoto) { _photo = inPhoto; + _modifyCount++; } - /** * @return associated Photo object */ - public Photo getPhoto() - { + public Photo getPhoto() { return _photo; } + /** + * Set the audio clip for this point + * @param inAudio audio object + */ + public void setAudio(AudioClip inAudio) { + _audio = inAudio; + _modifyCount++; + } + + /** + * @return associated audio object + */ + public AudioClip getAudio() { + return _audio; + } + + /** + * Attach the given media object according to type + * @param inMedia either a photo or an audio clip + */ + public void attachMedia(MediaObject inMedia) + { + if (inMedia != null) { + if (inMedia instanceof Photo) { + setPhoto((Photo) inMedia); + inMedia.setDataPoint(this); + } + else if (inMedia instanceof AudioClip) { + setAudio((AudioClip) inMedia); + inMedia.setDataPoint(this); + } + } + } /** * @return true if the point is valid @@ -258,6 +358,31 @@ public class DataPoint return _latitude.isValid() && _longitude.isValid(); } + /** + * @return true if the point has either a photo or audio attached + */ + public boolean hasMedia() { + 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 @@ -344,7 +469,7 @@ public class DataPoint */ public DataPoint clonePoint() { - // Copy all values + // Copy all values (note that photo not copied) String[] valuesCopy = new String[_fieldValues.length]; System.arraycopy(_fieldValues, 0, valuesCopy, 0, _fieldValues.length); // Make new object to hold cloned data @@ -354,30 +479,39 @@ public class DataPoint /** - * Restore the contents from another point - * @param inOther point containing contents to copy - * @return true if successful + * Remove all single and double quotes surrounding each value + * @param inValues array of values */ - public boolean restoreContents(DataPoint inOther) + private static void removeQuotes(String[] inValues) { - if (inOther != null) + if (inValues == null) {return;} + for (int i=0; i