Menu
▾
▴
SF.net SVN: matplotlib:[8925] trunk/matplotlib
|
From: <piv...@us...> - 2011-01-17 19:27:52
|
Revision: 8925
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8925&view=rev
Author: pivanov314
Date: 2011-01-17 19:27:43 +0000 (Mon, 17 Jan 2011)
Log Message:
-----------
[DOC] fixed lots of typos in mpl_toolkits
Modified Paths:
--------------
trunk/matplotlib/doc/mpl_toolkits/axes_grid/index.rst
trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axes_divider.rst
trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axisartist.rst
trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/overview.rst
trunk/matplotlib/examples/axes_grid/demo_axes_divider.py
trunk/matplotlib/examples/axes_grid/demo_axes_grid.py
trunk/matplotlib/examples/axes_grid/demo_floating_axes.py
trunk/matplotlib/examples/axes_grid/demo_floating_axis.py
trunk/matplotlib/lib/mpl_toolkits/axes_grid/colorbar.py
trunk/matplotlib/lib/mpl_toolkits/axes_grid1/anchored_artists.py
trunk/matplotlib/lib/mpl_toolkits/axes_grid1/axes_divider.py
trunk/matplotlib/lib/mpl_toolkits/axes_grid1/axes_grid.py
trunk/matplotlib/lib/mpl_toolkits/axes_grid1/axes_size.py
trunk/matplotlib/lib/mpl_toolkits/axes_grid1/colorbar.py
trunk/matplotlib/lib/mpl_toolkits/axes_grid1/inset_locator.py
trunk/matplotlib/lib/mpl_toolkits/axisartist/angle_helper.py
trunk/matplotlib/lib/mpl_toolkits/axisartist/axis_artist.py
trunk/matplotlib/lib/mpl_toolkits/axisartist/axisline_style.py
trunk/matplotlib/lib/mpl_toolkits/axisartist/axislines.py
trunk/matplotlib/lib/mpl_toolkits/axisartist/clip_path.py
trunk/matplotlib/lib/mpl_toolkits/axisartist/floating_axes.py
trunk/matplotlib/lib/mpl_toolkits/axisartist/grid_finder.py
trunk/matplotlib/lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py
trunk/matplotlib/lib/mpl_toolkits/mplot3d/axes3d.py
trunk/matplotlib/lib/mpl_toolkits/mplot3d/proj3d.py
Modified: trunk/matplotlib/doc/mpl_toolkits/axes_grid/index.rst
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/index.rst 2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/index.rst 2011-01-17 19:27:43 UTC (rev 8925)
@@ -18,13 +18,13 @@
0.99. Originally, the toolkit had a single namespace of
*axes_grid*. In more recent version (since svn r8226), the toolkit
has divided into two separate namespace (*axes_grid1* and *axisartist*).
- While *axes_grid* namespace is maintained for he backward compatibility,
+ While *axes_grid* namespace is maintained for the backward compatibility,
use of *axes_grid1* and *axisartist* is recommended.
.. warning::
*axes_grid* and *axisartist* (but not *axes_grid1*) uses
- a custome Axes class (derived from the mpl's original Axes class).
- As a sideeffect, some commands (mostly tick-related) do not work.
+ a custom Axes class (derived from the mpl's original Axes class).
+ As a side effect, some commands (mostly tick-related) do not work.
Use *axes_grid1* to avoid this, or see how things are different in
*axes_grid* and *axisartist* (LINK needed)
Modified: trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axes_divider.rst
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axes_divider.rst 2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axes_divider.rst 2011-01-17 19:27:43 UTC (rev 8925)
@@ -4,20 +4,21 @@
The axes_divider module provide helper classes to adjust the axes
positions of set of images in the drawing time.
-* :mod:`~mpl_toolkits.axes_grid.axes_size` provides a classese of
+* :mod:`~mpl_toolkits.axes_grid.axes_size` provides a classes of
units that the size of each axes will be determined. For example,
you can specify a fixed size
* :class:`~mpl_toolkits.axes_grid.axes_size.Divider` this is the class
that is used calculates the axes position. It divides the given
- renctangular area into several areas. You intialize the divider by
+ rectangular area into several areas. You initialize the divider by
setting the horizontal and vertical list of sizes that the division
will be based on. You then use the new_locator method, whose return
value is a callable object that can be used to set the axes_locator
of the axes.
-You first initialize the divider by specifying its grids, i.e., horiz and vert.
+You first initialize the divider by specifying its grids, i.e.,
+horizontal and vertical.
for example,::
@@ -56,8 +57,8 @@
The :mod:`mpl_toolkits.axes_grid.axes_size` contains several classes
-that can be used to set the horiz and vert. For example, for the
-vertical configuration above will be::
+that can be used to set the horizontal and vertical configurations. For
+example, for the vertical configuration above will be::
from mpl_toolkits.axes_grid.axes_size import Fixed, Scaled
vert = [Fixed(2), Scaled(2), Scaled(3)]
@@ -84,7 +85,7 @@
.. plot:: mpl_toolkits/axes_grid/figures/simple_axes_divider2.py
:include-source:
-You can adjust the size of the each axes accroding to their x or y
+You can adjust the size of the each axes according to their x or y
data limits (AxesX and AxesY), similar to the axes aspect parameter.
.. plot:: mpl_toolkits/axes_grid/figures/simple_axes_divider3.py
Modified: trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axisartist.rst
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axisartist.rst 2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axisartist.rst 2011-01-17 19:27:43 UTC (rev 8925)
@@ -4,11 +4,11 @@
AXISARTIST namespace
====================
-The AxisArtist namesapce includes a derived Axes implementation. The
+The AxisArtist namespace includes a derived Axes implementation. The
biggest difference is that the artists responsible to draw axis line,
ticks, ticklabel and axis labels are separated out from the mpl's Axis
class, which are much more than artists in the original mpl. This
-change was strongly motivated to support curvlinear grid. Here are a
+change was strongly motivated to support curvilinear grid. Here are a
few things that mpl_tootlkits.axisartist.Axes is different from original
Axes from mpl.
@@ -18,7 +18,7 @@
have different tick location and different tick labels.
* gridlines are drawn by a Gridlines instance. The change was
- motivated that in curvelinear coordinate, a gridline may not cross
+ motivated that in curvilinear coordinate, a gridline may not cross
axis-lines (i.e., no associated ticks). In the original Axes class,
gridlines are tied to ticks.
@@ -26,7 +26,7 @@
In summary, all these changes was to support
-* a curvelinear grid.
+* a curvilinear grid.
* a floating axis
.. plot:: mpl_toolkits/axes_grid/examples/demo_floating_axis.py
@@ -111,7 +111,8 @@
ax.axis["bottom"].major_ticklabels.set_visible(False)
-AxisAritst provides a helper method to control the visibility of ticks, ticklabels, and label. To make ticklabel invisible, ::
+AxisAritst provides a helper method to control the visibility of ticks,
+ticklabels, and label. To make ticklabel invisible, ::
ax.axis["bottom"].toggle(ticklabels=False)
@@ -138,7 +139,7 @@
for n in ["top","right"]:
ax.axis[n].toggle(ticklabels=True))
-So, any return values in the for loop are ignored. And you shoud not
+So, any return values in the for loop are ignored. And you should not
use it anything more than a simple method.
Like the list indexing ":" means all items, i.e., ::
@@ -184,8 +185,8 @@
axis.label.set_pad method.
-Rotaion and Alignment of TickLabels
-===================================
+Rotation and Alignment of TickLabels
+====================================
This is also quite different from the original mpl and can be
confusing. When you want to rotate the ticklabels, first consider
@@ -252,7 +253,7 @@
.. plot:: mpl_toolkits/axes_grid/figures/demo_axis_direction.py
-The axis_drection can be adjusted in the AxisArtist level, or in the
+The axis_direction can be adjusted in the AxisArtist level, or in the
level of its child arists, i.e., ticks, ticklabels, and axis-label. ::
ax1.axis["left"].set_axis_direction("top")
@@ -264,7 +265,7 @@
changes the axis_direction of only the major_ticklabels. Note that
set_axis_direction in the AxisArtist level changes the
-ticklabel_direction and label_direction, while chainging the
+ticklabel_direction and label_direction, while changing the
axis_direction of ticks, ticklabels, and axis-label does not affect
them.
@@ -295,11 +296,11 @@
* set_ticksize : size in points
* TickLabels' methods (major_ticklabels and minor_ticklabels)
* set_axis_direction : "left", "right", "bottom", or "top"
- * set_rotation : angle with respect to the renference direction
+ * set_rotation : angle with respect to the reference direction
* set_ha and set_va : see below
* AxisLabels' methods (label)
* set_axis_direction : "left", "right", "bottom", or "top"
- * set_rotation : angle with respect to the renference direction
+ * set_rotation : angle with respect to the reference direction
* set_ha and set_va
@@ -329,13 +330,13 @@
GridHelper
==========
-To actually define a curvelinear coordinate, you have to use your own
+To actually define a curvilinear coordinate, you have to use your own
grid helper. A generalised version of grid helper class is supplied
and this class should suffice in most of cases. A user may provide
two functions which defines a transformation (and its inverse pair)
-from the curved coordinate to (rectlinear) image coordinate. Note that
+from the curved coordinate to (rectilinear) image coordinate. Note that
while ticks and grids are drawn for curved coordinate, the data
-transform of the axes itself (ax.transData) is still rectlinear
+transform of the axes itself (ax.transData) is still rectilinear
(image) coordinate. ::
@@ -404,7 +405,7 @@
)
-Again, the *transData* of the axes is still a rectlinear coordinate
+Again, the *transData* of the axes is still a rectilinear coordinate
(image coordinate). You may manually do conversion between two
coordinates, or you may use Parasite Axes for convenience.::
@@ -447,7 +448,7 @@
The code need more refinement. Here is a incomplete list of issues and TODO's
* No easy way to support a user customized tick location (for
- curvelinear grid). A new Locator class needs to be created.
+ curvilinear grid). A new Locator class needs to be created.
* FloatingAxis may have coordinate limits, e.g., a floating axis of x
= 0, but y only spans from 0 to 1.
Modified: trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/overview.rst
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/overview.rst 2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/overview.rst 2011-01-17 19:27:43 UTC (rev 8925)
@@ -17,19 +17,19 @@
0.99. Originally, the toolkit had a single namespace of
*axes_grid*. In more recent version (since svn r8226), the toolkit
has divided into two separate namespace (*axes_grid1* and *axisartist*).
- While *axes_grid* namespace is maintained for he backward compatibility,
+ While *axes_grid* namespace is maintained for the backward compatibility,
use of *axes_grid1* and *axisartist* is recommended.
.. warning::
*axes_grid* and *axisartist* (but not *axes_grid1*) uses
- a custome Axes class (derived from the mpl's original Axes class).
- As a sideeffect, some commands (mostly tick-related) do not work.
+ a custom Axes class (derived from the mpl's original Axes class).
+ As a side effect, some commands (mostly tick-related) do not work.
Use *axes_grid1* to avoid this, or see how things are different in
*axes_grid* and *axisartist* (LINK needed)
AxesGrid toolkit has two namespaces (*axes_grid1* and *axisartist*).
-*axisartist* contains custome Axes class that is meant to support for
+*axisartist* contains custom Axes class that is meant to support for
curvilinear grids (e.g., the world coordinate system in astronomy).
Unlike mpl's original Axes class which uses Axes.xaxis and Axes.yaxis
to draw ticks, ticklines and etc., Axes in axisartist uses special
@@ -46,7 +46,7 @@
(multiple) images with matplotlib. In matplotlib, the axes location
(and size) is specified in the normalized figure coordinates, which
may not be ideal for displaying images that needs to have a given
-aspect ratio. For example, it helps you to have a colobar whose
+aspect ratio. For example, it helps you to have a colorbar whose
height always matches that of the image. `ImageGrid`_, `RGB Axes`_ and
`AxesDivider`_ are helper classes that deals with adjusting the
location of (multiple) Axes. They provides a framework to adjust the
@@ -76,9 +76,9 @@
.. plot:: mpl_toolkits/axes_grid/examples/simple_axesgrid.py
:include-source:
-* The postion of each axes is determined at the drawing time (see
+* The position of each axes is determined at the drawing time (see
`AxesDivider`_), so that the size of the entire grid fits in the
- given rectangle (like the aspec of axes). Note that in this example,
+ given rectangle (like the aspect of axes). Note that in this example,
the paddings between axes are fixed even if you changes the figure
size.
@@ -141,7 +141,7 @@
means the increasing direction of the axes number.
*aspect*
- By default (False), widths and heigths of axes in the grid are
+ By default (False), widths and heights of axes in the grid are
scaled independently. If True, they are scaled according to their
data limits (similar to aspect parameter in mpl).
@@ -165,7 +165,7 @@
| grid[1] | grid[3] |
+---------+---------+
-You can also create a colorbar (or colobars). You can have colorbar
+You can also create a colorbar (or colorbars). You can have colorbar
for each axes (cbar_mode="each"), or you can have a single colorbar
for the grid (cbar_mode="single"). The colorbar can be placed on your
right, or top. The axes for each colorbar is stored as a *cbar_axes*
@@ -187,7 +187,7 @@
explained in (yet to be written) AxesDividerGuide, direct use of the
AxesDivider class will not be necessary for most users. The
axes_divider module provides a helper function make_axes_locatable,
-which can be useful. It takes a exisitng axes instance and create a
+which can be useful. It takes a existing axes instance and create a
divider for it. ::
ax = subplot(1,1,1)
@@ -196,7 +196,7 @@
-*make_axes_locatable* returns an isntance of the AxesLocator class,
+*make_axes_locatable* returns an instance of the AxesLocator class,
derived from the Locator. It provides *append_axes* method that
creates a new axes on the given side of ("top", "right", "bottom" and
"left") of the original axes.
@@ -255,7 +255,7 @@
In most cases, you first create a host axes, which provides a few
method that can be used to create parasite axes. They are *twinx*,
*twiny* (which are similar to twinx and twiny in the matplotlib) and
-*twin*. *twin* takes an arbitraty tranfromation that maps between the
+*twin*. *twin* takes an arbitrary transformation that maps between the
data coordinates of the host axes and the parasite axes. *draw*
method of the parasite axes are never called. Instead, host axes
collects artists in parasite axes and draw them as if they belong to
@@ -292,7 +292,7 @@
-A more sophiscated example using twin. Note that if you change the
+A more sophisticated example using twin. Note that if you change the
x-limit in the host axes, the x-limit of the parasite axes will change
accordingly.
@@ -319,7 +319,7 @@
:mod:`mpl_toolkits.axes_grid.inset_locator` provides helper classes
and functions to place your (inset) axes at the anchored position of
-the parent axes, similarly to AnchoredArtis.
+the parent axes, similarly to AnchoredArtist.
Using :func:`mpl_toolkits.axes_grid.inset_locator.inset_axes`, you
can have inset axes whose size is either fixed, or a fixed proportion
@@ -359,7 +359,7 @@
RGB Axes
~~~~~~~~
-RGBAxes is a helper clase to conveniently show RGB composite
+RGBAxes is a helper class to conveniently show RGB composite
images. Like ImageGrid, the location of axes are adjusted so that the
area occupied by them fits in a given rectangle. Also, the xaxis and
yaxis of each axes are shared. ::
@@ -386,7 +386,7 @@
AxisArtist module provides a custom (and very experimental) Axes
class, where each axis (left, right, top and bottom) have a separate
-artist associated which is resposible to draw axis-line, ticks,
+artist associated which is responsible to draw axis-line, ticks,
ticklabels, label. Also, you can create your own axis, which can pass
through a fixed position in the axes coordinate, or a fixed position
in the data coordinate (i.e., the axis floats around when viewlimit
@@ -407,7 +407,7 @@
ax = AA.Axes(fig, [0.1, 0.1, 0.8, 0.8])
fig.add_axes(ax)
-or to creat a subplot ::
+or to create a subplot ::
ax = AA.Subplot(fig, 111)
fig.add_subplot(ax)
@@ -441,7 +441,7 @@
AxisArtist with ParasiteAxes
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Most commands in the axes_grid toolkit1 can take a axes_class keyword
+Most commands in the axes_grid1 toolkit can take a axes_class keyword
argument, and the commands creates an axes of the given class. For example,
to create a host subplot with axisartist.Axes, ::
@@ -458,10 +458,10 @@
-Curvelinear Grid
+Curvilinear Grid
----------------
-The motivation behind the AxisArtist module is to support cuvelinear grid
+The motivation behind the AxisArtist module is to support curvilinear grid
and ticks.
.. plot:: mpl_toolkits/axes_grid/examples/demo_floating_axis.py
@@ -472,7 +472,7 @@
Floating Axes
-------------
-This also suppport a Floating Axes whose outer axis are defined as
+This also support a Floating Axes whose outer axis are defined as
floating axis.
.. plot:: mpl_toolkits/axes_grid/examples/demo_floating_axes.py
Modified: trunk/matplotlib/examples/axes_grid/demo_axes_divider.py
===================================================================
--- trunk/matplotlib/examples/axes_grid/demo_axes_divider.py 2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/examples/axes_grid/demo_axes_divider.py 2011-01-17 19:27:43 UTC (rev 8925)
@@ -27,7 +27,7 @@
# axes for image
ax = LocatableAxes(fig1, divider.get_position())
- # axes for coloarbar
+ # axes for colorbar
ax_cb = LocatableAxes(fig1, divider.get_position())
h = [Size.AxesX(ax), # main axes
@@ -117,7 +117,7 @@
## PLOT 4
- # two images side by sied with fixed padding.
+ # two images side by side with fixed padding.
ax = fig1.add_subplot(2, 2, 4)
demo_images_side_by_sied(ax)
Modified: trunk/matplotlib/examples/axes_grid/demo_axes_grid.py
===================================================================
--- trunk/matplotlib/examples/axes_grid/demo_axes_grid.py 2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/examples/axes_grid/demo_axes_grid.py 2011-01-17 19:27:43 UTC (rev 8925)
@@ -12,7 +12,7 @@
def demo_simple_grid(fig):
"""
A grid of 2x2 images with 0.05 inch pad between images and only
- the lower-left axes is labeld.
+ the lower-left axes is labeled.
"""
grid = AxesGrid(fig, 131, # similar to subplot(131)
nrows_ncols = (2, 2),
@@ -31,7 +31,7 @@
def demo_grid_with_single_cbar(fig):
"""
- A grid of 2x2 images with a single colobar
+ A grid of 2x2 images with a single colorbar
"""
grid = AxesGrid(fig, 132, # similar to subplot(132)
nrows_ncols = (2, 2),
@@ -58,7 +58,7 @@
def demo_grid_with_each_cbar(fig):
"""
- A grid of 2x2 images. Each image has its own colobar.
+ A grid of 2x2 images. Each image has its own colorbar.
"""
grid = AxesGrid(F, 133, # similar to subplot(122)
Modified: trunk/matplotlib/examples/axes_grid/demo_floating_axes.py
===================================================================
--- trunk/matplotlib/examples/axes_grid/demo_floating_axes.py 2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/examples/axes_grid/demo_floating_axes.py 2011-01-17 19:27:43 UTC (rev 8925)
@@ -146,7 +146,7 @@
ax3, aux_ax3 = setup_axes3(fig, 133)
- theta = (8 + np.random.rand(10)*(14-8))*15. # indegree
+ theta = (8 + np.random.rand(10)*(14-8))*15. # in degrees
radius = np.random.rand(10)*14000.
aux_ax3.scatter(theta, radius)
Modified: trunk/matplotlib/examples/axes_grid/demo_floating_axis.py
===================================================================
--- trunk/matplotlib/examples/axes_grid/demo_floating_axis.py 2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/examples/axes_grid/demo_floating_axis.py 2011-01-17 19:27:43 UTC (rev 8925)
@@ -1,5 +1,5 @@
"""
-An experimental support for curvelinear grid.
+An experimental support for curvilinear grid.
"""
Modified: trunk/matplotlib/lib/mpl_toolkits/axes_grid/colorbar.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axes_grid/colorbar.py 2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/lib/mpl_toolkits/axes_grid/colorbar.py 2011-01-17 19:27:43 UTC (rev 8925)
@@ -162,7 +162,7 @@
class CbarAxesLocator(object):
"""
- CbarAxesLocator is a axes_locator for colobar axes. It adjust the
+ CbarAxesLocator is a axes_locator for colorbar axes. It adjust the
position of the axes to make a room for extended ends, i.e., the
extended ends are located outside the axes area.
"""
@@ -194,7 +194,7 @@
def get_end_vertices(self):
"""
return a tuple of two vertices for the colorbar extended ends.
- The first vertives is for min. end, and the second is for
+ The first vertices is for min. end, and the second is for
max. end.
"""
# Note that concatenating two vertices needs to make a
@@ -390,7 +390,7 @@
def _get_colorbar_limits(self):
"""
- initial limits for colorbar range. The returne min, max values
+ initial limits for colorbar range. The returned min, max values
will be used to create colorbar solid(?) and etc.
"""
if self.boundaries is not None:
@@ -407,7 +407,7 @@
def _config_axes(self):
'''
- Adjust the properties of the axes to be adquate for colorbar display.
+ Adjust the properties of the axes to be adequate for colorbar display.
'''
ax = self.ax
@@ -416,7 +416,7 @@
orientation=self.orientation)
ax.set_axes_locator(axes_locator)
- # overide the get_data_ratio for the aspect works.
+ # override the get_data_ratio for the aspect works.
def _f():
return 1.
ax.get_data_ratio = _f
@@ -557,7 +557,7 @@
def add_lines(self, levels, colors, linewidths):
'''
- Draw lines on the colorbar. It deletes preexting lines.
+ Draw lines on the colorbar. It deletes preexisting lines.
'''
del self.lines
@@ -735,7 +735,7 @@
def update_bruteforce(self, mappable):
"""
Update the colorbar artists to reflect the change of the
- assocaited mappable.
+ associated mappable.
"""
self.update_artists()
Modified: trunk/matplotlib/lib/mpl_toolkits/axes_grid1/anchored_artists.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axes_grid1/anchored_artists.py 2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/lib/mpl_toolkits/axes_grid1/anchored_artists.py 2011-01-17 19:27:43 UTC (rev 8925)
@@ -17,7 +17,7 @@
**kwargs):
"""
*width*, *height*, *xdescent*, *ydescent* : the dimensions of the DrawingArea.
- *prop* : font property. this is only used for scaling the paddings.
+ *prop* : font property. This is only used for scaling the paddings.
"""
self.da = DrawingArea(width, height, xdescent, ydescent, clip=True)
@@ -69,7 +69,7 @@
**kwargs):
"""
Draw a horizontal bar with the size in data coordinate of the give axes.
- A label will be drawn underneath (center-alinged).
+ A label will be drawn underneath (center-aligned).
pad, borderpad in fraction of the legend font size (or prop)
sep in points.
Modified: trunk/matplotlib/lib/mpl_toolkits/axes_grid1/axes_divider.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axes_grid1/axes_divider.py 2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/lib/mpl_toolkits/axes_grid1/axes_divider.py 2011-01-17 19:27:43 UTC (rev 8925)
@@ -3,8 +3,8 @@
multiple axes at the drawing time.
Divider: this is the class that is used calculates the axes
- position. It divides the given renctangular area into several sub
- rectangles. You intialize the divider by setting the horizontal
+ position. It divides the given rectangular area into several sub
+ rectangles. You initialize the divider by setting the horizontal
and vertical list of sizes that the division will be based on. You
then use the new_locator method, whose return value is a callable
object that can be used to set the axes_locator of the axes.
@@ -23,8 +23,8 @@
class Divider(object):
"""
This is the class that is used calculates the axes position. It
- divides the given renctangular area into several
- sub-rectangles. You intialize the divider by setting the
+ divides the given rectangular area into several
+ sub-rectangles. You initialize the divider by setting the
horizontal and vertical lists of sizes
(:mod:`mpl_toolkits.axes_grid.axes_size`) that the division will
be based on. You then use the new_locator method to create a
@@ -44,11 +44,11 @@
:param vertical: list of sizes
(:mod:`~mpl_toolkits.axes_grid.axes_size`)
for vertical division
- :param aspect: if True, the overall rectalngular area is reduced
+ :param aspect: if True, the overall rectangular area is reduced
so that the relative part of the horizontal and
vertical scales have same scale.
- :param anchor: Detrmine how the reduced rectangle is placed
- when aspect is True,
+ :param anchor: Determine how the reduced rectangle is placed
+ when aspect is True.
"""
self._fig = fig
@@ -290,7 +290,7 @@
class AxesLocator(object):
"""
- A simple callable object, initiallized with AxesDivider class,
+ A simple callable object, initialized with AxesDivider class,
returns the position and size of the given cell.
"""
def __init__(self, axes_divider, nx, ny, nx1=None, ny1=None):
@@ -336,7 +336,7 @@
class SubplotDivider(Divider):
"""
- The Divider class whose rectangle area is specified as a subplot grometry.
+ The Divider class whose rectangle area is specified as a subplot geometry.
"""
@@ -475,18 +475,17 @@
:param size: A width of the axes. A :mod:`~mpl_toolkits.axes_grid.axes_size`
instance or if float or string is given, *from_any*
- fucntion is used to create one, with *ref_size* set to AxesX instance
+ function is used to create one, with *ref_size* set to AxesX instance
of the current axes.
:param pad: pad between the axes. It takes same argument as *size*.
:param pack_start: If False, the new axes is appended at the end
of the list, i.e., it became the right-most axes. If True, it is
- inseted at the start of the list, and becomes the left-most axes.
+ inserted at the start of the list, and becomes the left-most axes.
- All extra keywords argument is passed to when creating a axes.
- if *axes_class* is given, the new axes will be created as an
+ All extra keywords arguments are passed to the created axes.
+ If *axes_class* is given, the new axes will be created as an
instance of the given class. Otherwise, the same class of the
- main axes will be used. if Not provided
-
+ main axes will be used.
"""
if pad:
@@ -522,18 +521,17 @@
:param size: A height of the axes. A :mod:`~mpl_toolkits.axes_grid.axes_size`
instance or if float or string is given, *from_any*
- fucntion is used to create one, with *ref_size* set to AxesX instance
+ function is used to create one, with *ref_size* set to AxesX instance
of the current axes.
:param pad: pad between the axes. It takes same argument as *size*.
:param pack_start: If False, the new axes is appended at the end
of the list, i.e., it became the top-most axes. If True, it is
- inseted at the start of the list, and becomes the bottom-most axes.
+ inserted at the start of the list, and becomes the bottom-most axes.
- All extra keywords argument is passed to when creating a axes.
- if *axes_class* is given, the new axes will be created as an
+ All extra keywords arguments are passed to the created axes.
+ If *axes_class* is given, the new axes will be created as an
instance of the given class. Otherwise, the same class of the
- main axes will be used. if Not provided
-
+ main axes will be used.
"""
if pad:
@@ -751,7 +749,7 @@
class VBoxDivider(HBoxDivider):
"""
- The Divider class whose rectangle area is specified as a subplot grometry.
+ The Divider class whose rectangle area is specified as a subplot geometry.
"""
Modified: trunk/matplotlib/lib/mpl_toolkits/axes_grid1/axes_grid.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axes_grid1/axes_grid.py 2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/lib/mpl_toolkits/axes_grid1/axes_grid.py 2011-01-17 19:27:43 UTC (rev 8925)
@@ -187,7 +187,7 @@
Keyword Default Description
================ ======== =========================================
direction "row" [ "row" | "column" ]
- axes_pad 0.02 float| pad betweein axes given in inches
+ axes_pad 0.02 float| pad between axes given in inches
add_all True [ True | False ]
share_all False [ True | False ]
share_x True [ True | False ]
@@ -475,7 +475,7 @@
Keyword Default Description
================ ======== =========================================
direction "row" [ "row" | "column" ]
- axes_pad 0.02 float| pad betweein axes given in inches
+ axes_pad 0.02 float| pad between axes given in inches
add_all True [ True | False ]
share_all False [ True | False ]
aspect True [ True | False ]
Modified: trunk/matplotlib/lib/mpl_toolkits/axes_grid1/axes_size.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axes_grid1/axes_size.py 2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/lib/mpl_toolkits/axes_grid1/axes_size.py 2011-01-17 19:27:43 UTC (rev 8925)
@@ -1,6 +1,6 @@
"""
-provides a classese of simlpe units that will be used with AxesDivider
+provides a classes of simple units that will be used with AxesDivider
class (or others) to determine the size of each axes. The unit
classes define `get_size` method that returns a tuple of two floats,
meaning relative and absolute sizes, respectively.
Modified: trunk/matplotlib/lib/mpl_toolkits/axes_grid1/colorbar.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axes_grid1/colorbar.py 2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/lib/mpl_toolkits/axes_grid1/colorbar.py 2011-01-17 19:27:43 UTC (rev 8925)
@@ -162,7 +162,7 @@
class CbarAxesLocator(object):
"""
- CbarAxesLocator is a axes_locator for colobar axes. It adjust the
+ CbarAxesLocator is a axes_locator for colorbar axes. It adjust the
position of the axes to make a room for extended ends, i.e., the
extended ends are located outside the axes area.
"""
@@ -194,8 +194,8 @@
def get_end_vertices(self):
"""
return a tuple of two vertices for the colorbar extended ends.
- The first vertives is for min. end, and the second is for
- max. end.
+ The first vertices is for the minimum end, and the second is for
+ the maximum end.
"""
# Note that concatenating two vertices needs to make a
# vertices for the frame.
@@ -390,7 +390,7 @@
def _get_colorbar_limits(self):
"""
- initial limits for colorbar range. The returne min, max values
+ initial limits for colorbar range. The returned min, max values
will be used to create colorbar solid(?) and etc.
"""
if self.boundaries is not None:
@@ -407,7 +407,7 @@
def _config_axes(self):
'''
- Adjust the properties of the axes to be adquate for colorbar display.
+ Adjust the properties of the axes to be adequate for colorbar display.
'''
ax = self.ax
@@ -416,7 +416,7 @@
orientation=self.orientation)
ax.set_axes_locator(axes_locator)
- # overide the get_data_ratio for the aspect works.
+ # override the get_data_ratio for the aspect works.
def _f():
return 1.
ax.get_data_ratio = _f
@@ -559,7 +559,7 @@
def add_lines(self, levels, colors, linewidths):
'''
- Draw lines on the colorbar. It deletes preexting lines.
+ Draw lines on the colorbar. It deletes preexisting lines.
'''
del self.lines
@@ -737,7 +737,7 @@
def update_bruteforce(self, mappable):
"""
Update the colorbar artists to reflect the change of the
- assocaited mappable.
+ associated mappable.
"""
self.update_artists()
Modified: trunk/matplotlib/lib/mpl_toolkits/axes_grid1/inset_locator.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axes_grid1/inset_locator.py 2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/lib/mpl_toolkits/axes_grid1/inset_locator.py 2011-01-17 19:27:43 UTC (rev 8925)
@@ -143,7 +143,7 @@
class BboxPatch(Patch):
def __init__(self, bbox, **kwargs):
if "transform" in kwargs:
- raise ValueError("trnasform should nt be set")
+ raise ValueError("transform should not be set")
kwargs["transform"] = IdentityTransform()
Patch.__init__(self, **kwargs)
@@ -225,7 +225,7 @@
"""
if "transform" in kwargs:
- raise ValueError("trnasform should nt be set")
+ raise ValueError("transform should not be set")
kwargs["transform"] = IdentityTransform()
Patch.__init__(self, **kwargs)
Modified: trunk/matplotlib/lib/mpl_toolkits/axisartist/angle_helper.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axisartist/angle_helper.py 2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/lib/mpl_toolkits/axisartist/angle_helper.py 2011-01-17 19:27:43 UTC (rev 8925)
@@ -130,8 +130,8 @@
levs = np.arange(math.floor(f1/step), math.ceil(f2/step)+0.5,
1, dtype="i") * step
- # n : number valid levels. If there is a cycle, e.g., [0, 90, 180,
- # 270, 360], the a grid line needs to be extend from 0 to 360, so
+ # n : number of valid levels. If there is a cycle, e.g., [0, 90, 180,
+ # 270, 360], the grid line needs to be extended from 0 to 360, so
# we need to return the whole array. However, the last level (360)
# needs to be ignored often. In this case, so we return n=4.
@@ -288,7 +288,7 @@
get extreme values.
x1, y1, x2, y2 in image coordinates (0-based)
- nx, ny : number of dvision in each axis
+ nx, ny : number of divisions in each axis
"""
x_, y_ = np.linspace(x1, x2, self.nx), np.linspace(y1, y2, self.ny)
x, y = np.meshgrid(x_, y_)
Modified: trunk/matplotlib/lib/mpl_toolkits/axisartist/axis_artist.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axisartist/axis_artist.py 2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/lib/mpl_toolkits/axisartist/axis_artist.py 2011-01-17 19:27:43 UTC (rev 8925)
@@ -10,7 +10,7 @@
The main artist class is a AxisArtist and a GridlinesCollection. The
GridlinesCollection is responsible for drawing grid lines and the
AxisArtist is responsible for all other artists. The AxisArtist class
-has attributest that are associated with each type of artists.
+has attributes that are associated with each type of artists.
* line : axis line
* major_ticks : major tick lines
@@ -25,11 +25,14 @@
ax.axis["bottom"]
-where *ax* is an instance of axes (mpl_toolkits.axislines.Axes).
-Thus, ax.axis["bottom"].line is an artist associated with the axis line, and ax.axis["bottom"].major_ticks is an artist associated with the major tick lines.
+where *ax* is an instance of axes (mpl_toolkits.axislines.Axes). Thus,
+ax.axis["bottom"].line is an artist associated with the axis line, and
+ax.axis["bottom"].major_ticks is an artist associated with the major tick
+lines.
You can change the colors, fonts, line widths, etc. of these artists
-by calling sutable set method. For example, to change the color of the major ticks of the bottom axis to red,
+by calling suitable set method. For example, to change the color of the major
+ticks of the bottom axis to red,
ax.axis["bottom"].major_ticks.set_color("r")
@@ -39,7 +42,7 @@
axis_direction
--------------
-AxisArtist, AxisLabel, TickLabels have *axis_drection* attribute,
+AxisArtist, AxisLabel, TickLabels have *axis_direction* attribute,
which adjusts the location, angle, etc.,. The *axis_direction* must be
one of [left, right, bottom, top] and they follow the matplotlib
convention for the rectangle axis.
@@ -62,7 +65,7 @@
ticklabels angle 90 0 -90 180
axislabel angle 180 0 0 180
ticklabel va center baseline center baseline
- axislabel va center top center btoom
+ axislabel va center top center bottom
ticklabel ha right center right center
axislabel ha right center right center
@@ -177,7 +180,7 @@
self._ref_artist = artist
def get_ref_artist(self):
- raise RuntimeError("get_ref_artist must overriden")
+ raise RuntimeError("get_ref_artist must overridden")
#return self._ref_artist
def get_attribute_from_ref_artist(self, attr_name, default_value):
@@ -257,7 +260,7 @@
def set_ticksize(self, ticksize):
"""
- set lenth of the ticks in points.
+ set length of the ticks in points.
"""
self._ticksize = ticksize
@@ -490,7 +493,7 @@
class AxisLabel(LabelBase, AttributeCopier):
"""
Axis Label. Derived from Text. The position of the text is updated
- in the fly, so chaning text position has no effect. Otherwise, the
+ in the fly, so changing text position has no effect. Otherwise, the
properties can be changed as a normal Text.
To change the pad between ticklabels and axis label, use set_pad.
@@ -587,7 +590,7 @@
property left bottom right top
===================== ========== ========= ========== ==========
axislabel angle 180 0 0 180
- axislabel va center top center btoom
+ axislabel va center top center bottom
axislabel ha right center right center
===================== ========== ========= ========== ==========
@@ -808,7 +811,7 @@
def get_texts_widths_heights_descents(self, renderer):
"""
- return a list of width, height, descent for ticklaels.
+ return a list of width, height, descent for ticklabels.
"""
whd_list = []
for (x, y), a, l in self._locs_angles_labels:
@@ -981,7 +984,7 @@
ticklabel va center baseline center baseline
ticklabel ha right center right center
axislabel angle 180 0 0 180
- axislabel va center top center btoom
+ axislabel va center top center bottom
axislabel ha right center right center
===================== ========== ========= ========== ==========
Modified: trunk/matplotlib/lib/mpl_toolkits/axisartist/axisline_style.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axisartist/axisline_style.py 2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/lib/mpl_toolkits/axisartist/axisline_style.py 2011-01-17 19:27:43 UTC (rev 8925)
@@ -6,7 +6,7 @@
class _FancyAxislineStyle:
class SimpleArrow(FancyArrowPatch):
"""
- The artist class that will be returend for SimpleArrow style.
+ The artist class that will be returned for SimpleArrow style.
"""
_ARROW_STYLE = "->"
@@ -60,7 +60,7 @@
def draw(self, renderer):
"""
Draw the axis line.
- 1) transform the path to the display cooridnate.
+ 1) transform the path to the display coordinate.
2) extend the path to make a room for arrow
3) update the path of the FancyArrowPatch.
4) draw
@@ -75,7 +75,7 @@
class FilledArrow(SimpleArrow):
"""
- The artist class that will be returend for SimpleArrow style.
+ The artist class that will be returned for SimpleArrow style.
"""
_ARROW_STYLE = "-|>"
@@ -115,7 +115,7 @@
def __init__(self):
"""
- initializtion.
+ initialization.
"""
super(AxislineStyle._Base, self).__init__()
Modified: trunk/matplotlib/lib/mpl_toolkits/axisartist/axislines.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axisartist/axislines.py 2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/lib/mpl_toolkits/axisartist/axislines.py 2011-01-17 19:27:43 UTC (rev 8925)
@@ -3,7 +3,7 @@
biggest difference is that the artists responsible to draw axis line,
ticks, ticklabel and axis labels are separated out from the mpl's Axis
class, which are much more than artists in the original
-mpl. Originally, this change was motivated to support curvlinear
+mpl. Originally, this change was motivated to support curvilinear
grid. Here are a few reasons that I came up with new axes class.
@@ -11,7 +11,7 @@
different ticks (tick locations and labels). This is not possible
with the current mpl, although some twin axes trick can help.
- * Curvelinear grid.
+ * Curvilinear grid.
* angled ticks.
@@ -109,7 +109,7 @@
return trans
def get_tick_iterators(self, axes):
- # iter : iteratoable object that yields (c, angle, l) where
+ # iter : iteratable object that yields (c, angle, l) where
# c, angle, l is position, tick angle, and label
return iter_major, iter_minor
@@ -639,7 +639,7 @@
self.axes._set_artist_props(gridlines)
# gridlines.set_clip_path(self.axes.patch)
- # set_clip_path need to be defered after Axes.cla is completed.
+ # set_clip_path need to be deferred after Axes.cla is completed.
# It is done inside the cla.
self.gridlines = gridlines
@@ -662,7 +662,7 @@
def grid(self, b=None, which='major', **kwargs):
"""
- Toggel the gridlines, and optionally set the properties of the lines.
+ Toggle the gridlines, and optionally set the properties of the lines.
"""
# their are some discrepancy between the behavior of grid in
# axes_grid and the original mpl's grid, because axes_grid
Modified: trunk/matplotlib/lib/mpl_toolkits/axisartist/clip_path.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axisartist/clip_path.py 2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/lib/mpl_toolkits/axisartist/clip_path.py 2011-01-17 19:27:43 UTC (rev 8925)
@@ -10,7 +10,7 @@
return math.atan2(dy, dx)
# FIXME : The current algorithm seems to return incorrect angle when the line
-# ends at the boudnary.
+# ends at the boundary.
def clip(xlines, ylines, x0, clip="right"):
Modified: trunk/matplotlib/lib/mpl_toolkits/axisartist/floating_axes.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axisartist/floating_axes.py 2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/lib/mpl_toolkits/axisartist/floating_axes.py 2011-01-17 19:27:43 UTC (rev 8925)
@@ -1,5 +1,5 @@
"""
-An experimental support for curvelinear grid.
+An experimental support for curvilinear grid.
"""
@@ -225,7 +225,7 @@
get extreme values.
x1, y1, x2, y2 in image coordinates (0-based)
- nx, ny : number of dvision in each axis
+ nx, ny : number of division in each axis
"""
#lon_min, lon_max, lat_min, lat_max = self._extremes
return self._extremes
@@ -241,7 +241,7 @@
tick_formatter2=None):
"""
aux_trans : a transform from the source (curved) coordinate to
- target (rectlinear) coordinate. An instance of MPL's Transform
+ target (rectilinear) coordinate. An instance of MPL's Transform
(inverse transform should be defined) or a tuple of two callable
objects which defines the transform and its inverse. The callables
need take two arguments of array of source coordinates and
@@ -320,7 +320,7 @@
return axisline
- # new_floating_axis will inheirt the grid_helper's extremes.
+ # new_floating_axis will inherit the grid_helper's extremes.
# def new_floating_axis(self, nth_coord,
# value,
Modified: trunk/matplotlib/lib/mpl_toolkits/axisartist/grid_finder.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axisartist/grid_finder.py 2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/lib/mpl_toolkits/axisartist/grid_finder.py 2011-01-17 19:27:43 UTC (rev 8925)
@@ -19,7 +19,7 @@
get extreme values.
x1, y1, x2, y2 in image coordinates (0-based)
- nx, ny : number of dvision in each axis
+ nx, ny : number of division in each axis
"""
x_, y_ = np.linspace(x1, x2, self.nx), np.linspace(y1, y2, self.ny)
x, y = np.meshgrid(x_, y_)
@@ -31,9 +31,10 @@
return self._add_pad(lon_min, lon_max, lat_min, lat_max)
def _add_pad(self, lon_min, lon_max, lat_min, lat_max):
- # a small amound of padding is added because the current
- # clipping algorithms seems to fail when the gidline ends at
- # the bbox boundary.
+ """ a small amount of padding is added because the current
+ clipping algorithms seems to fail when the gridline ends at
+ the bbox boundary.
+ """
dlon = (lon_max - lon_min) / self.nx
dlat = (lat_max - lat_min) / self.ny
@@ -205,7 +206,7 @@
"tick_formatter2"]:
setattr(self, k, kw[k])
else:
- raise ValueError("unknwonw update property")
+ raise ValueError("unknown update property '%s'" % k)
@@ -220,7 +221,7 @@
tick_formatter1=None,
tick_formatter2=None):
"""
- transform : transfrom from the image coordinate (which will be
+ transform : transform from the image coordinate (which will be
the transData of the axes to the world coordinate.
or transform = (transform_xy, inv_transform_xy)
Modified: trunk/matplotlib/lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py 2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py 2011-01-17 19:27:43 UTC (rev 8925)
@@ -1,5 +1,5 @@
"""
-An experimental support for curvelinear grid.
+An experimental support for curvilinear grid.
"""
from itertools import chain
@@ -309,7 +309,7 @@
tick_formatter2=None):
"""
aux_trans : a transform from the source (curved) coordinate to
- target (rectlinear) coordinate. An instance of MPL's Transform
+ target (rectilinear) coordinate. An instance of MPL's Transform
(inverse transform should be defined) or a tuple of two callable
objects which defines the transform and its inverse. The callables
need take two arguments of array of source coordinates and
Modified: trunk/matplotlib/lib/mpl_toolkits/mplot3d/axes3d.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/mplot3d/axes3d.py 2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/lib/mpl_toolkits/mplot3d/axes3d.py 2011-01-17 19:27:43 UTC (rev 8925)
@@ -225,7 +225,7 @@
self.autoscale_view()
def autoscale_view(self, scalex=True, scaley=True, scalez=True, **kw):
- # This method looks at the rectanglular volume (see above)
+ # This method looks at the rectangular volume (see above)
# of data and decides how to scale the view portal to fit it.
self.set_top_view()
Modified: trunk/matplotlib/lib/mpl_toolkits/mplot3d/proj3d.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/mplot3d/proj3d.py 2011-01-17 17:48:03 UTC (rev 8924)
+++ trunk/matplotlib/lib/mpl_toolkits/mplot3d/proj3d.py 2011-01-17 19:27:43 UTC (rev 8925)
@@ -51,7 +51,7 @@
p0[1] = y(s)
intersection point p = p1 + u*(p2-p1)
- and intersection point lies within segement if u is between 0 and 1
+ and intersection point lies within segment if u is between 0 and 1
"""
x21 = p2[0] - p1[0]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
