Version 19, May 2018

[GpsPrune.git] / tim / prune / data / DataPoint.java

diff --git a/tim/prune/data/DataPoint.java b/tim/prune/data/DataPoint.java
index c2446228161401202b4d3cbfba107a56f3cfde70..84f4800bcd2c0a0d546da8a83a87868810bf3a54 100644 (file)
--- a/tim/prune/data/DataPoint.java
+++ b/tim/prune/data/DataPoint.java
@@ -81,7 +81,7 @@ public class DataPoint
                        }
                }
                if (inField == null || inField == Field.TIMESTAMP) {
                        }
                }
                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);
                }
                if (inField == null || inField == Field.WAYPT_NAME) {
                        _waypointName = getFieldValue(Field.WAYPT_NAME);


@@ -118,7 +118,7 @@ public class DataPoint
                        _altitude = inAltitude;
                        _fieldValues[2] = "" + inAltitude.getValue();
                }
                        _altitude = inAltitude;
                        _fieldValues[2] = "" + inAltitude.getValue();
                }

-               _timestamp = new Timestamp(null);
+               _timestamp = new TimestampUtc(null);

        }
 
 
        }
 
 


@@ -369,12 +369,12 @@ public class DataPoint
         * Add a time offset to this point
         * @param inOffset offset to add (-ve to subtract)
         */
         * Add a time offset to this point
         * @param inOffset offset to add (-ve to subtract)
         */

-       public void addTimeOffset(long inOffset)
+       public void addTimeOffsetSeconds(long inOffset)

        {
                if (hasTimestamp())
                {
        {
                if (hasTimestamp())
                {

-                       _timestamp.addOffset(inOffset);
-                       _fieldValues[_fieldList.getFieldIndex(Field.TIMESTAMP)] = _timestamp.getText();
+                       _timestamp.addOffsetSeconds(inOffset);
+                       _fieldValues[_fieldList.getFieldIndex(Field.TIMESTAMP)] = _timestamp.getText(null);

                        setModified(false);
                }
        }
                        setModified(false);
                }
        }