Revision: 5375
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5375&view=rev
Author: jdh2358
Date: 2008-06-03 13:28:14 -0700 (Tue, 03 Jun 2008)
Log Message:
-----------
cleaned up some imports to accord with coding guide
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/artist.py
trunk/matplotlib/lib/matplotlib/axes.py
trunk/matplotlib/lib/matplotlib/axis.py
trunk/matplotlib/lib/matplotlib/mlab.py
Modified: trunk/matplotlib/lib/matplotlib/artist.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/artist.py 2008-06-03 16:41:53 UTC (rev
5374)
+++ trunk/matplotlib/lib/matplotlib/artist.py 2008-06-03 20:28:14 UTC (rev
5375)
@@ -1,6 +1,6 @@
from __future__ import division
import re, warnings
-from cbook import iterable, flatten
+import matplotlib.cbook as cbook
from transforms import Bbox, IdentityTransform, TransformedBbox,
TransformedPath
from path import Path
@@ -507,7 +507,7 @@
sequence (all Artists are of the same type) and it is your
responsibility to make sure this is so.
"""
- if iterable(o) and len(o): o = o[0]
+ if cbook.iterable(o) and len(o): o = o[0]
self.o = o
self.aliasd = self.get_aliases()
@@ -757,8 +757,8 @@
print insp.pprint_setters(prop=args[0])
return
- if not iterable(h): h = [h]
- else: h = flatten(h)
+ if not cbook.iterable(h): h = [h]
+ else: h = cbook.flatten(h)
if len(args)%2:
@@ -776,7 +776,7 @@
funcName = "set_%s"%s
func = getattr(o,funcName)
ret.extend( [func(val)] )
- return [x for x in flatten(ret)]
+ return [x for x in cbook.flatten(ret)]
def kwdoc(a):
return '\n'.join(ArtistInspector(a).pprint_setters(leadingspace=2))
Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py 2008-06-03 16:41:53 UTC (rev
5374)
+++ trunk/matplotlib/lib/matplotlib/axes.py 2008-06-03 20:28:14 UTC (rev
5375)
@@ -7,25 +7,25 @@
import matplotlib
rcParams = matplotlib.rcParams
-from matplotlib import artist as martist
-from matplotlib import axis as maxis
-from matplotlib import cbook
-from matplotlib import collections as mcoll
-from matplotlib import colors as mcolors
-from matplotlib import contour as mcontour
-from matplotlib import dates as mdates
-from matplotlib import font_manager
-from matplotlib import image as mimage
-from matplotlib import legend as mlegend
-from matplotlib import lines as mlines
-from matplotlib import mlab
-from matplotlib import patches as mpatches
-from matplotlib import quiver as mquiver
-from matplotlib import scale as mscale
-from matplotlib import table as mtable
-from matplotlib import text as mtext
-from matplotlib import ticker as mticker
-from matplotlib import transforms as mtransforms
+import matplotlib.artist as martist
+import matplotlib.axis as maxis
+import matplotlib.cbook as cbook
+import matplotlib.collections as mcoll
+import matplotlib.colors as mcolors
+import matplotlib.contour as mcontour
+import matplotlib.dates as mdates
+import matplotlib.font_manager as font_manager
+import matplotlib.image as mimage
+import matplotlib.legend as mlegend
+import matplotlib.lines as mlines
+import matplotlib.mlab as mlab
+import matplotlib.patches as mpatches
+import matplotlib.quiver as mquiver
+import matplotlib.scale as mscale
+import matplotlib.table as mtable
+import matplotlib.text as mtext
+import matplotlib.ticker as mticker
+import matplotlib.transforms as mtransforms
iterable = cbook.iterable
is_string_like = cbook.is_string_like
Modified: trunk/matplotlib/lib/matplotlib/axis.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axis.py 2008-06-03 16:41:53 UTC (rev
5374)
+++ trunk/matplotlib/lib/matplotlib/axis.py 2008-06-03 20:28:14 UTC (rev
5375)
@@ -3,25 +3,20 @@
"""
from __future__ import division
-from artist import Artist, setp
-from cbook import silent_list, popall, CallbackRegistry
-from lines import Line2D, TICKLEFT, TICKRIGHT, TICKUP, TICKDOWN
-from matplotlib import rcParams
-from patches import bbox_artist
-from ticker import NullFormatter, FixedFormatter, ScalarFormatter
-from ticker import NullLocator, FixedLocator, AutoLocator
+from matplotlib import rcParams
+import matplotlib.artist as artist
+import matplotlib.cbook as cbook
+import matplotlib.font_manager as font_manager
+import matplotlib.lines as mlines
+import matplotlib.patches as mpatches
+import matplotlib.scale as mscale
+import matplotlib.text as mtext
+import matplotlib.ticker as mticker
+import matplotlib.transforms as mtransforms
+import matplotlib.units as munits
-from font_manager import FontProperties
-from text import Text, TextWithDash
-from transforms import Affine2D, Bbox, blended_transform_factory, \
- IdentityTransform, interval_contains
-from patches import bbox_artist
-from scale import scale_factory
-import matplotlib.units as units
-
-
-class Tick(Artist):
+class Tick(artist.Artist):
"""
Abstract base class for the axis ticks, grid lines and labels
@@ -41,7 +36,6 @@
label1On : a boolean which determines whether to draw tick label
label2On : a boolean which determines whether to draw tick label
-
"""
def __init__(self, axes, loc, label,
size = None, # points
@@ -57,7 +51,7 @@
loc is the tick location in data coords
size is the tick size in relative, axes coords
"""
- Artist.__init__(self)
+ artist.Artist.__init__(self)
if gridOn is None: gridOn = rcParams['axes.grid']
@@ -75,12 +69,12 @@
self._tickdir = rcParams['%s.direction'%name]
if self._tickdir == 'in':
- self._xtickmarkers = (TICKUP, TICKDOWN)
- self._ytickmarkers = (TICKRIGHT, TICKLEFT)
+ self._xtickmarkers = (mlines.TICKUP, mlines.TICKDOWN)
+ self._ytickmarkers = (mlines.TICKRIGHT, mlines.TICKLEFT)
self._pad = pad
else:
- self._xtickmarkers = (TICKDOWN, TICKUP)
- self._ytickmarkers = (TICKLEFT, TICKRIGHT)
+ self._xtickmarkers = (mlines.TICKDOWN, mlines.TICKUP)
+ self._ytickmarkers = (mlines.TICKLEFT, mlines.TICKRIGHT)
self._pad = pad + size
self._loc = loc
@@ -107,11 +101,11 @@
return children
def set_clip_path(self, clippath, transform=None):
- Artist.set_clip_path(self, clippath, transform)
+ artist.Artist.set_clip_path(self, clippath, transform)
#self.tick1line.set_clip_path(clippath, transform)
#self.tick2line.set_clip_path(clippath, transform)
self.gridline.set_clip_path(clippath, transform)
- set_clip_path.__doc__ = Artist.set_clip_path.__doc__
+ set_clip_path.__doc__ = artist.Artist.set_clip_path.__doc__
def get_pad_pixels(self):
return self.figure.dpi * self._pad / 72.0
@@ -165,7 +159,7 @@
def draw(self, renderer):
if not self.get_visible(): return
renderer.open_group(self.__name__)
- midPoint = interval_contains(self.get_view_interval(), self.get_loc())
+ midPoint = mtransforms.interval_contains(self.get_view_interval(),
self.get_loc())
if midPoint:
if self.gridOn:
@@ -201,7 +195,7 @@
def _set_artist_props(self, a):
a.set_figure(self.figure)
- #if isinstance(a, Line2D): a.set_clip_box(self.axes.bbox)
+ #if isinstance(a, mlines.Line2D): a.set_clip_box(self.axes.bbox)
def get_view_interval(self):
'return the view Interval instance for the axis tjis tick is ticking'
@@ -222,12 +216,12 @@
# the y loc is 3 points below the min of y axis
# get the affine as an a,b,c,d,tx,ty list
# x in data coords, y in axes coords
- #t = Text(
+ #t = mtext.Text(
trans, vert, horiz = self.axes.get_xaxis_text1_transform(self._pad)
-
- t = TextWithDash(
+ size = rcParams['xtick.labelsize']
+ t = mtext.TextWithDash(
x=0, y=0,
- fontproperties=FontProperties(size=rcParams['xtick.labelsize']),
+ fontproperties=font_manager.FontProperties(size=size),
color=rcParams['xtick.color'],
verticalalignment=vert,
horizontalalignment=horiz,
@@ -244,12 +238,12 @@
'Get the default Text 2 instance'
# x in data coords, y in axes coords
- #t = Text(
+ #t = mtext.Text(
trans, vert, horiz = self.axes.get_xaxis_text2_transform(self._pad)
- t = TextWithDash(
+ t = mtext.TextWithDash(
x=0, y=1,
- fontproperties=FontProperties(size=rcParams['xtick.labelsize']),
+
fontproperties=font_manager.FontProperties(size=rcParams['xtick.labelsize']),
color=rcParams['xtick.color'],
verticalalignment=vert,
dashdirection=1,
@@ -263,7 +257,7 @@
def _get_tick1line(self):
'Get the default line2D instance'
# x in data coords, y in axes coords
- l = Line2D(xdata=(0,), ydata=(0,),
+ l = mlines.Line2D(xdata=(0,), ydata=(0,),
color='k',
linestyle = 'None',
marker = self._xtickmarkers[0],
@@ -276,7 +270,7 @@
def _get_tick2line(self):
'Get the default line2D instance'
# x in data coords, y in axes coords
- l = Line2D( xdata=(0,), ydata=(1,),
+ l = mlines.Line2D( xdata=(0,), ydata=(1,),
color='k',
linestyle = 'None',
marker = self._xtickmarkers[1],
@@ -290,7 +284,7 @@
def _get_gridline(self):
'Get the default line2D instance'
# x in data coords, y in axes coords
- l = Line2D(xdata=(0.0, 0.0), ydata=(0, 1.0),
+ l = mlines.Line2D(xdata=(0.0, 0.0), ydata=(0, 1.0),
color=rcParams['grid.color'],
linestyle=rcParams['grid.linestyle'],
linewidth=rcParams['grid.linewidth'],
@@ -357,12 +351,12 @@
def _get_text1(self):
'Get the default Text instance'
# x in axes coords, y in data coords
- #t = Text(
+ #t = mtext.Text(
trans, vert, horiz = self.axes.get_yaxis_text1_transform(self._pad)
- t = TextWithDash(
+ t = mtext.TextWithDash(
x=0, y=0,
- fontproperties=FontProperties(size=rcParams['ytick.labelsize']),
+
fontproperties=font_manager.FontProperties(size=rcParams['ytick.labelsize']),
color=rcParams['ytick.color'],
verticalalignment=vert,
horizontalalignment=horiz,
@@ -377,12 +371,12 @@
def _get_text2(self):
'Get the default Text instance'
# x in axes coords, y in data coords
- #t = Text(
+ #t = mtext.Text(
trans, vert, horiz = self.axes.get_yaxis_text2_transform(self._pad)
- t = TextWithDash(
+ t = mtext.TextWithDash(
x=1, y=0,
- fontproperties=FontProperties(size=rcParams['ytick.labelsize']),
+
fontproperties=font_manager.FontProperties(size=rcParams['ytick.labelsize']),
color=rcParams['ytick.color'],
verticalalignment=vert,
dashdirection=1,
@@ -397,7 +391,7 @@
'Get the default line2D instance'
# x in axes coords, y in data coords
- l = Line2D( (0,), (0,), color='k',
+ l = mlines.Line2D( (0,), (0,), color='k',
marker = self._ytickmarkers[0],
linestyle = 'None',
markersize=self._size,
@@ -409,7 +403,7 @@
def _get_tick2line(self):
'Get the default line2D instance'
# x in axes coords, y in data coords
- l = Line2D( (1,), (0,), color='k',
+ l = mlines.Line2D( (1,), (0,), color='k',
marker = self._ytickmarkers[1],
linestyle = 'None',
markersize=self._size,
@@ -422,7 +416,7 @@
def _get_gridline(self):
'Get the default line2D instance'
# x in axes coords, y in data coords
- l = Line2D( xdata=(0,1), ydata=(0, 0),
+ l = mlines.Line2D( xdata=(0,1), ydata=(0, 0),
color=rcParams['grid.color'],
linestyle=rcParams['grid.linestyle'],
linewidth=rcParams['grid.linewidth'],
@@ -485,7 +479,7 @@
-class Axis(Artist):
+class Axis(artist.Artist):
"""
Public attributes
@@ -505,13 +499,13 @@
"""
Init the axis with the parent Axes instance
"""
- Artist.__init__(self)
+ artist.Artist.__init__(self)
self.set_figure(axes.figure)
self.axes = axes
self.major = Ticker()
self.minor = Ticker()
- self.callbacks = CallbackRegistry(('units', 'units finalize'))
+ self.callbacks = cbook.CallbackRegistry(('units', 'units finalize'))
#class dummy:
# locator = None
@@ -535,7 +529,7 @@
return self._scale.name
def set_scale(self, value, **kwargs):
- self._scale = scale_factory(value, self, **kwargs)
+ self._scale = mscale.scale_factory(value, self, **kwargs)
self._scale.set_default_locators_and_formatters(self)
def limit_range_for_scale(self, vmin, vmax):
@@ -552,13 +546,13 @@
def cla(self):
'clear the current axis'
- self.set_major_locator(AutoLocator())
- self.set_major_formatter(ScalarFormatter())
- self.set_minor_locator(NullLocator())
- self.set_minor_formatter(NullFormatter())
+ self.set_major_locator(mticker.AutoLocator())
+ self.set_major_formatter(mticker.ScalarFormatter())
+ self.set_minor_locator(mticker.NullLocator())
+ self.set_minor_formatter(mticker.NullFormatter())
# Clear the callback registry for this axis, or it may "leak"
- self.callbacks = CallbackRegistry(('units', 'units finalize'))
+ self.callbacks = cbook.CallbackRegistry(('units', 'units finalize'))
# whether the grids are on
self._gridOnMajor = rcParams['axes.grid']
@@ -571,8 +565,8 @@
# define 1 so properties set on ticks will be copied as they
# grow
- popall(self.majorTicks)
- popall(self.minorTicks)
+ cbook.popall(self.majorTicks)
+ cbook.popall(self.minorTicks)
self.majorTicks.extend([self._get_tick(major=True)])
self.minorTicks.extend([self._get_tick(major=False)])
@@ -584,7 +578,7 @@
self.set_units(None)
def set_clip_path(self, clippath, transform=None):
- Artist.set_clip_path(self, clippath, transform)
+ artist.Artist.set_clip_path(self, clippath, transform)
majorticks = self.get_major_ticks()
minorticks = self.get_minor_ticks()
for child in self.majorTicks + self.minorTicks:
@@ -642,7 +636,7 @@
interval = self.get_view_interval()
for tick, loc, label in self.iter_ticks():
if tick is None: continue
- if not interval_contains(interval, loc): continue
+ if not mtransforms.interval_contains(interval, loc): continue
tick.update_position(loc)
tick.set_label1(label)
tick.set_label2(label)
@@ -654,13 +648,13 @@
ticklabelBoxes2.append(extent)
if len(ticklabelBoxes):
- bbox = Bbox.union(ticklabelBoxes)
+ bbox = mtransforms.Bbox.union(ticklabelBoxes)
else:
- bbox = Bbox.from_extents(0, 0, 0, 0)
+ bbox = mtransforms.Bbox.from_extents(0, 0, 0, 0)
if len(ticklabelBoxes2):
- bbox2 = Bbox.union(ticklabelBoxes2)
+ bbox2 = mtransforms.Bbox.union(ticklabelBoxes2)
else:
- bbox2 = Bbox.from_extents(0, 0, 0, 0)
+ bbox2 = mtransforms.Bbox.from_extents(0, 0, 0, 0)
return bbox, bbox2
def draw(self, renderer, *args, **kwargs):
@@ -673,7 +667,7 @@
interval = self.get_view_interval()
for tick, loc, label in self.iter_ticks():
if tick is None: continue
- if not interval_contains(interval, loc): continue
+ if not mtransforms.interval_contains(interval, loc): continue
tick.update_position(loc)
tick.set_label1(label)
tick.set_label2(label)
@@ -699,8 +693,8 @@
if 0: # draw the bounding boxes around the text for debug
for tick in majorTicks:
label = tick.label1
- bbox_artist(label, renderer)
- bbox_artist(self.label, renderer)
+ mpatches.bbox_artist(label, renderer)
+ mpatches.bbox_artist(self.label, renderer)
renderer.close_group(__name__)
@@ -713,7 +707,7 @@
def get_gridlines(self):
'Return the grid lines as a list of Line2D instance'
ticks = self.get_major_ticks()
- return silent_list('Line2D gridline', [tick.gridline for tick in
ticks])
+ return cbook.silent_list('Line2D gridline', [tick.gridline for tick in
ticks])
def get_label(self):
'Return the axis label as a Text instance'
@@ -732,14 +726,14 @@
ticks = self.get_major_ticks()
labels1 = [tick.label1 for tick in ticks if tick.label1On]
labels2 = [tick.label2 for tick in ticks if tick.label2On]
- return silent_list('Text major ticklabel', labels1+labels2)
+ return cbook.silent_list('Text major ticklabel', labels1+labels2)
def get_minorticklabels(self):
'Return a list of Text instances for the minor ticklabels'
ticks = self.get_minor_ticks()
labels1 = [tick.label1 for tick in ticks if tick.label1On]
labels2 = [tick.label2 for tick in ticks if tick.label2On]
- return silent_list('Text minor ticklabel', labels1+labels2)
+ return cbook.silent_list('Text minor ticklabel', labels1+labels2)
def get_ticklabels(self, minor=False):
'Return a list of Text instances for ticklabels'
@@ -754,7 +748,7 @@
for tick in ticks:
lines.append(tick.tick1line)
lines.append(tick.tick2line)
- return silent_list('Line2D ticklines', lines)
+ return cbook.silent_list('Line2D ticklines', lines)
def get_minorticklines(self):
'Return the minor tick lines as a list of Line2D instances'
@@ -763,7 +757,7 @@
for tick in ticks:
lines.append(tick.tick1line)
lines.append(tick.tick2line)
- return silent_list('Line2D ticklines', lines)
+ return cbook.silent_list('Line2D ticklines', lines)
def get_ticklines(self, minor=False):
'Return the tick lines as a list of Line2D instances'
@@ -887,14 +881,14 @@
for tick in self.minorTicks: # don't use get_ticks here!
if tick is None: continue
tick.gridOn = self._gridOnMinor
- if len(kwargs): setp(tick.gridline,**kwargs)
+ if len(kwargs): artist.setp(tick.gridline,**kwargs)
else:
if b is None: self._gridOnMajor = not self._gridOnMajor
else: self._gridOnMajor = b
for tick in self.majorTicks: # don't use get_ticks here!
if tick is None: continue
tick.gridOn = self._gridOnMajor
- if len(kwargs): setp(tick.gridline,**kwargs)
+ if len(kwargs): artist.setp(tick.gridline,**kwargs)
def update_units(self, data):
@@ -904,7 +898,7 @@
registered for unit conversion
"""
- converter = units.registry.get_converter(data)
+ converter = munits.registry.get_converter(data)
if converter is None: return False
self.converter = converter
default = self.converter.default_units(data)
@@ -944,7 +938,7 @@
def convert_units(self, x):
if self.converter is None:
- self.converter = units.registry.get_converter(x)
+ self.converter = munits.registry.get_converter(x)
if self.converter is None:
#print 'convert_units returning identity: units=%s,
converter=%s'%(self.units, self.converter)
@@ -967,7 +961,7 @@
else:
if u!=self.units:
self.units = u
- #print 'setting units', self.converter, u,
units.registry.get_converter(u)
+ #print 'setting units', self.converter, u,
munits.registry.get_converter(u)
pchanged = True
if pchanged:
self._update_axisinfo()
@@ -1036,13 +1030,13 @@
#ticklabels = [str(l) for l in ticklabels]
minor = kwargs.pop('minor', False)
if minor:
- self.set_minor_formatter(FixedFormatter(ticklabels))
+ self.set_minor_formatter(mticker.FixedFormatter(ticklabels))
ticks = self.get_minor_ticks()
else:
- self.set_major_formatter( FixedFormatter(ticklabels) )
+ self.set_major_formatter( mticker.FixedFormatter(ticklabels) )
ticks = self.get_major_ticks()
- self.set_major_formatter( FixedFormatter(ticklabels) )
+ self.set_major_formatter( mticker.FixedFormatter(ticklabels) )
ret = []
for i, tick in enumerate(ticks):
@@ -1067,10 +1061,10 @@
else:
self.set_view_interval(max(ticks), min(ticks))
if minor:
- self.set_minor_locator(FixedLocator(ticks))
+ self.set_minor_locator(mticker.FixedLocator(ticks))
return self.get_minor_ticks(len(ticks))
else:
- self.set_major_locator( FixedLocator(ticks) )
+ self.set_major_locator( mticker.FixedLocator(ticks) )
return self.get_major_ticks(len(ticks))
def _update_label_position(self, bboxes, bboxes2):
@@ -1119,14 +1113,14 @@
def _get_label(self):
# x in axes coords, y in display coords (to be updated at draw
# time by _update_label_positions)
- label = Text(x=0.5, y=0,
- fontproperties = FontProperties(size=rcParams['axes.labelsize']),
+ label = mtext.Text(x=0.5, y=0,
+ fontproperties =
font_manager.FontProperties(size=rcParams['axes.labelsize']),
color = rcParams['axes.labelcolor'],
verticalalignment='top',
horizontalalignment='center',
)
- label.set_transform( blended_transform_factory(
- self.axes.transAxes, IdentityTransform() ))
+ label.set_transform( mtransforms.blended_transform_factory(
+ self.axes.transAxes, mtransforms.IdentityTransform() ))
self._set_artist_props(label)
self.label_position='bottom'
@@ -1134,14 +1128,14 @@
def _get_offset_text(self):
# x in axes coords, y in display coords (to be updated at draw time)
- offsetText = Text(x=1, y=0,
- fontproperties = FontProperties(size=rcParams['xtick.labelsize']),
+ offsetText = mtext.Text(x=1, y=0,
+ fontproperties =
font_manager.FontProperties(size=rcParams['xtick.labelsize']),
color = rcParams['xtick.color'],
verticalalignment='top',
horizontalalignment='right',
)
- offsetText.set_transform( blended_transform_factory(
- self.axes.transAxes, IdentityTransform() ))
+ offsetText.set_transform( mtransforms.blended_transform_factory(
+ self.axes.transAxes, mtransforms.IdentityTransform() ))
self._set_artist_props(offsetText)
self.offset_text_position='bottom'
return offsetText
@@ -1176,7 +1170,7 @@
if not len(bboxes):
bottom = self.axes.bbox.ymin
else:
- bbox = Bbox.union(bboxes)
+ bbox = mtransforms.Bbox.union(bboxes)
bottom = bbox.y0
self.label.set_position( (x, bottom -
self.LABELPAD*self.figure.dpi / 72.0))
@@ -1184,7 +1178,7 @@
if not len(bboxes2):
top = self.axes.bbox.ymax
else:
- bbox = Bbox.union(bboxes2)
+ bbox = mtransforms.Bbox.union(bboxes2)
top = bbox.y1
self.label.set_position( (x, top+self.LABELPAD*self.figure.dpi /
72.0))
@@ -1197,7 +1191,7 @@
if not len(bboxes):
bottom = self.axes.bbox.ymin
else:
- bbox = Bbox.union(bboxes)
+ bbox = mtransforms.Bbox.union(bboxes)
bottom = bbox.y0
self.offsetText.set_position((x,
bottom-self.OFFSETTEXTPAD*self.figure.dpi/72.0))
@@ -1351,16 +1345,16 @@
def _get_label(self):
# x in display coords (updated by _update_label_position)
# y in axes coords
- label = Text(x=0, y=0.5,
+ label = mtext.Text(x=0, y=0.5,
# todo: get the label position
- fontproperties=FontProperties(size=rcParams['axes.labelsize']),
+
fontproperties=font_manager.FontProperties(size=rcParams['axes.labelsize']),
color = rcParams['axes.labelcolor'],
verticalalignment='center',
horizontalalignment='right',
rotation='vertical',
)
- label.set_transform( blended_transform_factory(
- IdentityTransform(), self.axes.transAxes) )
+ label.set_transform( mtransforms.blended_transform_factory(
+ mtransforms.IdentityTransform(), self.axes.transAxes) )
self._set_artist_props(label)
self.label_position='left'
@@ -1368,14 +1362,14 @@
def _get_offset_text(self):
# x in display coords, y in axes coords (to be updated at draw time)
- offsetText = Text(x=0, y=0.5,
- fontproperties = FontProperties(size=rcParams['ytick.labelsize']),
+ offsetText = mtext.Text(x=0, y=0.5,
+ fontproperties =
font_manager.FontProperties(size=rcParams['ytick.labelsize']),
color = rcParams['ytick.color'],
verticalalignment = 'bottom',
horizontalalignment = 'left',
)
- offsetText.set_transform(blended_transform_factory(
- self.axes.transAxes, IdentityTransform()) )
+ offsetText.set_transform(mtransforms.blended_transform_factory(
+ self.axes.transAxes, mtransforms.IdentityTransform()) )
self._set_artist_props(offsetText)
self.offset_text_position='left'
return offsetText
@@ -1410,7 +1404,7 @@
if not len(bboxes):
left = self.axes.bbox.xmin
else:
- bbox = Bbox.union(bboxes)
+ bbox = mtransforms.Bbox.union(bboxes)
left = bbox.x0
self.label.set_position( (left-self.LABELPAD*self.figure.dpi/72.0,
y))
@@ -1419,7 +1413,7 @@
if not len(bboxes2):
right = self.axes.bbox.xmax
else:
- bbox = Bbox.union(bboxes2)
+ bbox = mtransforms.Bbox.union(bboxes2)
right = bbox.x1
self.label.set_position(
(right+self.LABELPAD*self.figure.dpi/72.0, y))
Modified: trunk/matplotlib/lib/matplotlib/mlab.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/mlab.py 2008-06-03 16:41:53 UTC (rev
5374)
+++ trunk/matplotlib/lib/matplotlib/mlab.py 2008-06-03 20:28:14 UTC (rev
5375)
@@ -88,8 +88,8 @@
import numpy as np
-from matplotlib import nxutils
-from matplotlib import cbook
+import matplotlib.nxutils as nxutils
+import matplotlib.cbook as cbook
# set is a new builtin function in 2.4; delete the following when
# support for 2.3 is dropped.
@@ -1231,7 +1231,7 @@
converters, if not None, is a dictionary mapping column number to
a function that will convert that column to a float (or the optional
- dtype if specified). Eg, if column 0 is a date string:
+ dtype if specified). Eg, if column 0 is a date string:
converters={0:datestr2num}
skiprows is the number of rows from the top to skip
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
