Changeset 3653 for DPPP


Ignore:
Timestamp:
19/03/08 17:05:50 (11 years ago)
Author:
mkochan
Message:

Replaced "pylab" with "matplotlib" in imports in csml2kml, to make it work on superglue.

Location:
DPPP/kml/csml2kml/python/csml2kml/csml2kml
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • DPPP/kml/csml2kml/python/csml2kml/csml2kml/KML.py

    r3612 r3653  
    368368    @type sourceUrl: C{str} 
    369369    @ivar timespanStart: Start of validity period for the overlay. 
    370     @type timespanStart: C{pylab.dates.datetime.datetime} 
     370    @type timespanStart: C{matplotlib.dates.datetime.datetime} 
    371371    @ivar timespanEnd: End of validity period for the overlay. 
    372     @type timespanEnd: C{pylab.dates.datetime.datetime} 
     372    @type timespanEnd: C{matplotlib.dates.datetime.datetime} 
    373373    @ivar west: Bounding box coordinate 
    374374    @type west: C{float} 
  • DPPP/kml/csml2kml/python/csml2kml/csml2kml/Station.py

    r3651 r3653  
    44 
    55from cElementTree import XML 
    6 from pylab import dates     # a very good date/time module from matplotviz -- allows years < 1970 
     6from matplotlib import dates     # a very good date/time module from matplotviz -- allows years < 1970 
    77 
    88npXmlNamespace = 'http://ndg.nerc.ac.uk/np'  # the namespace in which the Station element is defined 
     
    7272    @type featureId: C{str} 
    7373    @ivar collectBeginDate: Data when feature collection started. 
    74     @type collectBeginDate: C{pylab.dates.datetime.datetime} 
     74    @type collectBeginDate: C{matplotlib.dates.datetime.datetime} 
    7575    @ivar collectEndDate: Data when feature collection started. 
    76     @type collectEndDate: C{pylab.dates.datetime.datetime} 
     76    @type collectEndDate: C{matplotlib.dates.datetime.datetime} 
    7777    ''' 
    7878 
  • DPPP/kml/csml2kml/python/csml2kml/csml2kml/StationConvertor.py

    r3614 r3653  
    44 
    55from cElementTree import ElementTree, Element, SubElement, XML 
    6 from pylab import * 
    76import re 
    87import csml 
  • DPPP/kml/csml2kml/python/csml2kml/csml2kml/WMSLayer.py

    r3612 r3653  
    55import os 
    66import re 
    7 from pylab import dates     # a very good date/time module from matplotviz -- allows years < 1970 
     7from matplotlib import dates     # a very good date/time module from matplotviz -- allows years < 1970 
    88from KML import * 
    99 
     
    153153    @ivar abstract: Abstract of the layer (explanation of underlying data) 
    154154    @ivar bbox: C{BBox} 
    155     @ivar timesteps: A list of C{pylab.dates.datetime.datetime} objects (the time dimension of the layer) 
     155    @ivar timesteps: A list of C{matplotlib.dates.datetime.datetime} objects (the time dimension of the layer) 
    156156    ''' 
    157157     
     
    257257        Translate a single time-step into a time-span. 
    258258        @param timestep: The date/time step 
    259         @type timestep: C{pylab.dates.datetime.datetime} 
     259        @type timestep: C{matplotlib.dates.datetime.datetime} 
    260260        @return: The (timespanStart, timespanEnd) tuple (both are datetime objects) 
    261261        ''' 
     
    266266        Get a category in which a timestep belongs to. 
    267267        @param timestep: The timestep. 
    268         @type timestep: C{pylab.dates.datetime.datetime} 
     268        @type timestep: C{matplotlib.dates.datetime.datetime} 
    269269        @return: The category in which C{timestep} belongs to 
    270270        ''' 
     
    283283        ''' 
    284284        A time-step transform, used by derived classes. 
    285         @type timestep: C{pylab.dates.datetime.datetime} 
     285        @type timestep: C{matplotlib.dates.datetime.datetime} 
    286286        ''' 
    287287        return timestep 
     
    290290        ''' 
    291291        A time-step transform, used by derived classes. 
    292         @type timestep: C{pylab.dates.datetime.datetime} 
     292        @type timestep: C{matplotlib.dates.datetime.datetime} 
    293293        ''' 
    294294        return timestep.replace(day=1) 
     
    297297        ''' 
    298298        A time-step transform, used by derived classes. 
    299         @type timestep: C{pylab.dates.datetime.datetime} 
     299        @type timestep: C{matplotlib.dates.datetime.datetime} 
    300300        ''' 
    301301        if timestep.month+1 <= 12: 
     
    307307        ''' 
    308308        A time-step transform, used by derived classes. 
    309         @type timestep: C{pylab.dates.datetime.datetime} 
     309        @type timestep: C{matplotlib.dates.datetime.datetime} 
    310310        ''' 
    311311        return timestep.replace(year=timestep.year+1) 
     
    314314        ''' 
    315315        A time-step transform, used by derived classes. 
    316         @type timestep: C{pylab.dates.datetime.datetime} 
     316        @type timestep: C{matplotlib.dates.datetime.datetime} 
    317317        @return: A timestep that is half of the viewed layer's period before C{timestep}. 
    318318        ''' 
     
    322322        ''' 
    323323        A time-step transform, used by derived classes. 
    324         @type timestep: C{pylab.dates.datetime.datetime} 
     324        @type timestep: C{matplotlib.dates.datetime.datetime} 
    325325        @return: A timestep that is half of the viewed layer's period after C{timestep}. 
    326326        ''' 
Note: See TracChangeset for help on using the changeset viewer.