X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fdata%2FDataPoint.java;h=34d7bd72055275f81339e1fe23c434d2008603c6;hb=4d5796d02a15808311c09448d79e6e7d1de9d636;hp=966b5606b7d2bdfcd2c608a4c36136acd28a3f77;hpb=112bb0c9b46894adca9a33ed8c99ea712b253185;p=GpsPrune.git diff --git a/tim/prune/data/DataPoint.java b/tim/prune/data/DataPoint.java index 966b560..34d7bd7 100644 --- a/tim/prune/data/DataPoint.java +++ b/tim/prune/data/DataPoint.java @@ -1,6 +1,6 @@ package tim.prune.data; -import tim.prune.Config; +import tim.prune.config.Config; /** * Class to represent a single data point in the series @@ -17,11 +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 @@ -35,6 +38,8 @@ public class DataPoint _fieldValues = inValueArray; // save list of fields _fieldList = inFieldList; + // Remove double quotes around values + removeQuotes(_fieldValues); // parse fields into objects parseFields(null, inAltFormat); } @@ -62,7 +67,8 @@ public class DataPoint if (inField == null || inField == Field.WAYPT_NAME) { _waypointName = getFieldValue(Field.WAYPT_NAME); } - if (inField == null || inField == Field.NEW_SEGMENT) { + 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"))); @@ -83,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); } @@ -125,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); @@ -148,6 +155,10 @@ 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 && _altitude.getFormat() != Altitude.Format.NO_FORMAT) { // Altitude already present so reuse format @@ -155,14 +166,36 @@ public class DataPoint } 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().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); } /** @@ -229,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 @@ -264,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 @@ -287,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 @@ -373,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 @@ -382,6 +478,41 @@ public class DataPoint } + /** + * 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