X-Git-Url: https://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fdata%2FDataPoint.java;h=7acd4f9e364314985d0ea2abb85996901352037b;hb=1ee49ae3c8ef3aa2e63eadd458531e5f8bd4f92c;hp=4cf7c827952a8c10c8c46adb5602e4fcbbf3d956;hpb=52bf9e8686c916be37a26a0b75340393d4478b05;p=GpsPrune.git diff --git a/tim/prune/data/DataPoint.java b/tim/prune/data/DataPoint.java index 4cf7c82..7acd4f9 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 @@ -18,7 +20,8 @@ public class DataPoint private Photo _photo = null; private String _waypointName = null; private boolean _startOfSegment = false; - + private boolean _markedForDeletion = false; + private int _modifyCount = 0; /** * Constructor @@ -26,31 +29,45 @@ 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; // 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 +84,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 +126,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 +150,46 @@ 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) { + if (!inUndo) { + _modifyCount++; + } + else { + _modifyCount--; + } + } // 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.getConfigBoolean(Config.KEY_METRIC_UNITS)?Altitude.Format.METRES:Altitude.Format.FEET); } } + /** + * @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 +234,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 +248,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 @@ -258,7 +313,6 @@ public class DataPoint return _latitude.isValid() && _longitude.isValid(); } - /** * Interpolate a set of points between this one and the given one * @param inEndPoint end point of interpolation @@ -344,7 +398,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 @@ -353,32 +407,6 @@ public class DataPoint } - /** - * Restore the contents from another point - * @param inOther point containing contents to copy - * @return true if successful - */ - public boolean restoreContents(DataPoint inOther) - { - if (inOther != null) - { - // Copy string values across - _fieldValues = inOther._fieldValues; - if (_altitude != null) - { - parseFields(_altitude.getFormat()); - } - else - { - // use default altitude format of metres - parseFields(Altitude.FORMAT_METRES); - } - return true; - } - return false; - } - - /** * Get string for debug * @see java.lang.Object#toString()