Changeset 946

Timestamp:

10/13/08 15:05:22 (3 months ago)

Author:

hobu

Message:

backport #83

Location:

branches/1.0/python

Files:

• liblas/point.py (modified) (3 diffs)
• tests/Point.txt (modified) (1 diff)

branches/1.0/python/liblas/point.py

@@ -44 +44 @@
 import datetime
 import time
+import math
 
 class Point(object):
@@ -178 +179 @@
     def get_time(self):
         t = core.las.LASPoint_GetTime(self.handle)
-        return datetime.datetime(*time.localtime(t)[0:7])
+        floor = math.floor(t)
+        ms = float(t) - floor
+        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)
+        
     def set_time(self, value):
         """
@@ -195 +201 @@
         """
         t = time.mktime(value.timetuple())
+        
+        ms = value.microsecond
+        t = float(t) + ms * 0.000001
         core.las.LASPoint_SetTime(self.handle,t)
     time = property(get_time, set_time)

branches/1.0/python/tests/Point.txt

@@ -61 +61 @@
   
   >>> import datetime
-  >>> t = datetime.datetime(2008,3,19)
+  >>> t = datetime.datetime(2008,3,19,23,45,45,134)
   >>> p.time = t
   >>> p.time
-  datetime.datetime(2008, 3, 19, 0, 0, 0, 2)
+  datetime.datetime(2008, 3, 19, 23, 45, 45, 134)
+  >>> p.time.microsecond
+  134
+  
+  >>> p.intensity
+  0
+  >>> p.intensity = 120
+  >>> p.intensity
+  120