Changeset 487
- Timestamp:
- 02/21/12 17:00:30
- Files:
-
- pyglider/trunk/pyglider/dbd2asc.py (modified) (1 diff)
- pyglider/trunk/pyglider/dbdcopy.py (modified) (1 diff)
- pyglider/trunk/pyglider/pyglider.py (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
pyglider/trunk/pyglider/dbd2asc.py
r477 r487 56 56 dt_str = dt.strftime("_%Y_%m_%d_%H%M") 57 57 # datetime string added to outfile name for raw2proc 58 outfile = os.path.join(asc_dir, f + dt_str + '.' + filetype + 'asc') 58 # outfile = os.path.join(asc_dir, f + dt_str + '.' + filetype + 'asc') 59 outfile = os.path.join(asc_dir, f + '.' + filetype + 'asc') 59 60 cache_dir = os.path.join(asc_dir, "cache") 60 61 if debug: pyglider/trunk/pyglider/dbdcopy.py
r475 r487 48 48 infile = os.path.join(fg_dir, f) 49 49 outfile = os.path.join(bd_dir, f) 50 rc = shutil.copy file(infile, outfile)50 rc = shutil.copy2(infile, outfile) # copy file and file stat 51 51 if rc: 52 raise IOError("shutil.copy filereturn code: " + str(rc))52 raise IOError("shutil.copy2 return code: " + str(rc)) 53 53 else: 54 54 print " ... Copied ", infile pyglider/trunk/pyglider/pyglider.py
r486 r487 46 46 return str 47 47 48 def dt2es(dt): 49 """Convert datetime object to epoch seconds (es) as seconds since Jan-01-1970 """ 50 # microseconds of timedelta object not used 51 delta = dt - datetime.datetime(1970,1,1,0,0,0) 52 es = delta.days*24*60*60 + delta.seconds 53 return es 54 55 def es2dt(es): 56 """ Convert epoch seconds (es) to datetime object""" 57 dt = datetime.datetime(*time.gmtime(es)[0:6]) 58 return dt 59 48 60 # ------------------------------------------------------------------- 49 61 # playground … … 526 538 def parse_glider_goto_ma(lines, glider): 527 539 data = [] 540 541 m = re.search(r'^(# File creation time:)\s*(.*)', ''.join(lines), re.MULTILINE) 542 if m: 543 try: 544 t = time.strptime(m.group(2), "%d-%b-%Y %H:%M:%S") 545 # the '*' operator unpacks the tuple, producing the argument list. 546 # add 5 hours for GMT 547 dt = datetime.datetime(*t[0:6]) + datetime.timedelta(hours=5) 548 dt_str = datetime.date.strftime(dt, "%Y-%m-%d %H:%M:%S UTC") 549 except: dt_str = None 550 528 551 m = re.search(r'\<start\:waypoints\>(.*)\<end\:waypoints\>', ''.join(lines), re.MULTILINE|re.S) 529 552 latlonstr = m.group(1) … … 551 574 lat = None 552 575 lon = None 576 html_str = '<div>'+glider+' goto position at</br> '+ dt_str + '</br>' + \ 577 ll+'</div>' 553 578 if lat and lon: 554 579 data.append({'glider': glider, 555 580 'name': '', 556 'description': '<div><code>'+ll+'</code></div>',581 'description': html_str, 557 582 'lon': lon, 558 583 'lat': lat}) … … 629 654 waypoint_line = KML.Placemark( 630 655 KML.name(glider), 631 KML.description(glider+' goto'),656 KML.description(glider+' latest goto waypoints'), 632 657 KML.styleUrl(linestyle), 633 658 KML.LineString(