Clean up imports.

igc2kmz/__init__.py

@@ -3,11 +3,11 @@ import datetime
 import numpy
 import pygooglechart
 
-import igc2kmz.color
-import igc2kmz.kml
-import igc2kmz.kmz
-import igc2kmz.scale
-import igc2kmz.util
+import color
+import kml
+import kmz
+import scale
+import util
 
 
 class Stock(object):
@@ -39,23 +39,23 @@ class Stock(object):
 class Globals(object):
 
   def __init__(self, options, tracks):
-    self.stock = igc2kmz.Stock()
-    self.bounds = igc2kmz.util.BoundsSet()
+    self.stock = Stock()
+    self.bounds = util.BoundsSet()
     for track in tracks:
       self.bounds.merge(track.bounds)
     self.timezone_offset = datetime.timedelta(0, 3600 * options.timezone_offset)
-    self.altitude_scale = igc2kmz.scale.Scale(self.bounds.ele.tuple(), title='altitude', gradient=igc2kmz.color.default_gradient)
+    self.altitude_scale = scale.Scale(self.bounds.ele.tuple(), title='altitude', gradient=color.default_gradient)
     self.altitude_styles = []
-    for color in self.altitude_scale.colors():
+    for c in self.altitude_scale.colors():
       balloon_style = kml.BalloonStyle(text='$[description]')
       icon_style = kml.IconStyle(kml.Icon.palette(4, 24), scale=0.5)
-      label_style = kml.LabelStyle(color=color)
+      label_style = kml.LabelStyle(color=c)
       self.altitude_styles.append(kml.Style(balloon_style, icon_style, label_style))
     self.stock.kmz.add_roots(*self.altitude_styles)
-    self.climb_scale = igc2kmz.scale.ZeroCenteredScale(self.bounds.climb.tuple(), title='climb', step=0.1, gradient=igc2kmz.color.bilinear_gradient)
-    self.speed_scale = igc2kmz.scale.Scale(self.bounds.speed.tuple(), title='ground speed', gradient=igc2kmz.color.default_gradient)
-    self.time_scale = igc2kmz.scale.TimeScale(self.bounds.time.tuple(), timezone_offset=self.timezone_offset)
-    self.progress_scale = igc2kmz.scale.Scale((0.0, 1.0), title='progress', gradient=igc2kmz.color.default_gradient)
+    self.climb_scale = scale.ZeroCenteredScale(self.bounds.climb.tuple(), title='climb', step=0.1, gradient=color.bilinear_gradient)
+    self.speed_scale = scale.Scale(self.bounds.speed.tuple(), title='ground speed', gradient=color.default_gradient)
+    self.time_scale = scale.TimeScale(self.bounds.time.tuple(), timezone_offset=self.timezone_offset)
+    self.progress_scale = scale.Scale((0.0, 1.0), title='progress', gradient=color.default_gradient)
     self.graph_width = 600
     self.graph_height = 300
 

igc2kmz/igc.py

@@ -4,9 +4,9 @@ import time
 import re
 import sys
 
-import igc2kmz.coord
-import igc2kmz.util
-import igc2kmz.track
+import coord
+import util
+import track
 
 
 A_RECORD_RE = re.compile(r'A(.*)\Z')
@@ -179,18 +179,18 @@ class IGC(object):
         break
     else:
       ele = 'alt'
-    coords = igc2kmz.util.TimeSeries()
+    coords = util.TimeSeries()
     for record in self.records:
       if isinstance(record, BRecord):
-        coords.append(igc2kmz.coord.Coord(record.lat, record.lon, getattr(record, ele)))
+        coords.append(coord.Coord(record.lat, record.lon, getattr(record, ele)))
         times.append(record.dt)
         t.append(int(time.mktime(record.dt.timetuple())))
     coords.t = t
-    meta = igc2kmz.util.OpenStruct(name=os.path.basename(self.filename), pilot_name=None, glider_type=None, glider_id=None)
+    meta = util.OpenStruct(name=os.path.basename(self.filename), pilot_name=None, glider_type=None, glider_id=None)
     if 'plt' in self.h and not NOT_SET_RE.match(self.h['plt']):
       meta.pilot_name = self.h['plt'].strip()
     if 'gty' in self.h and not NOT_SET_RE.match(self.h['gty']):
       meta.glider_type = self.h['gty'].strip()
     if 'gid' in self.h and not NOT_SET_RE.match(self.h['gid']):
       meta.glider_id = self.h['gid'].strip()
-    return igc2kmz.track.Track(meta, times, coords)
+    return track.Track(meta, times, coords)

igc2kmz/track.py

@@ -1,4 +1,4 @@
-import igc2kmz.util
+import util
 
 
 class Track(object):
@@ -11,11 +11,11 @@ class Track(object):
 
   def analyse(self, dt):
     n = len(self.coords)
-    self.bounds = igc2kmz.util.BoundsSet()
-    self.bounds.ele = igc2kmz.util.Bounds(self.coords[0].ele)
+    self.bounds = util.BoundsSet()
+    self.bounds.ele = util.Bounds(self.coords[0].ele)
     for coord in self.coords:
       self.bounds.ele.merge(coord.ele)
-    self.bounds.time = igc2kmz.util.Bounds((self.times[0], self.times[-1]))
+    self.bounds.time = util.Bounds((self.times[0], self.times[-1]))
     self.elevation_data = self.bounds.ele.min != 0 or self.bounds.ele.max != 0
     self.s = [0.0]
     for i in xrange(1, n):
@@ -84,5 +84,5 @@ class Track(object):
       self.climb.append(dz / dt)
       self.progress.append(progress)
       self.thermal.append(thermal)
-    self.bounds.speed = igc2kmz.util.Bounds(self.speed)
-    self.bounds.climb = igc2kmz.util.Bounds(self.climb)
+    self.bounds.speed = util.Bounds(self.speed)
+    self.bounds.climb = util.Bounds(self.climb)