Changeset 948

Timestamp:

10/13/08 22:18:36 (3 months ago)

Author:

hobu

Message:

backport r947 for #83

Location:

branches/1.0/python

Files:

• liblas/point.py (modified) (2 diffs)
• tests/File.txt (modified) (1 diff)
• tests/Header.txt (modified) (1 diff)
• tests/Point.txt (modified) (1 diff)

branches/1.0/python/liblas/point.py

@@ -181 +181 @@
         floor = math.floor(t)
         ms = float(t) - floor
+        
+        # clip to 999999
         ms = int(round(ms* 1000000 ))
-        lt = time.localtime(t)
-        return datetime.datetime(lt[0],lt[1],lt[2],lt[3],lt[4],lt[5],ms)
+        if ms > 999999:
+            ms = 999999
+
+        lt = time.gmtime(t)
+        value = datetime.datetime(lt[0],lt[1],lt[2],lt[3],lt[4],lt[5],ms)
+        return value
         
     def set_time(self, value):
@@ -195 +201 @@
         Example
         -------
-        >>> t = datetime.datetime(2008,3,19)
+        >>> td = datetime.timedelta(hours=6) # my timezone is -6
+        >>> t = datetime.datetime(2008,3,19) -td
         >>> p.time = t
         >>> p.time

branches/1.0/python/tests/File.txt

@@ -57 +57 @@
   <liblas.point.Point object at ...>
 
+
   >>> len(points)
   8  

branches/1.0/python/tests/Header.txt

@@ -25 +25 @@
 
   >>> import datetime
-  >>> now = datetime.datetime.now()
-  >>> today = datetime.datetime(now.year, now.month,now.day)
-  >>> h.date == today
+  >>> td = datetime.timedelta(hours=5) # my timezone is GMT-5
+  >>> now = datetime.datetime.now() - td
+  >>> today = datetime.datetime(now.year, now.month,now.day) 
+  
+  >>> x = h.date - td
+  >>> d = datetime.datetime(x.year, x.month, x.day)
+  >>> d == today
   True
   >>> t = datetime.datetime(2008,3,19)

branches/1.0/python/tests/Point.txt

@@ -61 +61 @@
   
   >>> import datetime
-  >>> t = datetime.datetime(2008,3,19,23,45,45,134)
+  >>> td = datetime.timedelta(hours=5) # my timezone is GMT-5
+  >>> t = datetime.datetime(2008,3,19,23,45,45,13434) - td
   >>> p.time = t
   >>> p.time
-  datetime.datetime(2008, 3, 19, 23, 45, 45, 134)
+  datetime.datetime(2008, 3, 19, 23, 45, 45, 13434)
   >>> p.time.microsecond
-  134
+  13434
   
   >>> p.intensity