Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit bb3ca0f

Browse files
mdboommdboom
committed
Merged revisions 4191-4219 via svnmerge from
http://matplotlib.svn.sf.net/svnroot/matplotlib/trunk/matplotlib ........ r4191 | efiring | 2007-11-09 14:37:15 -0500 (Fri, 09 Nov 2007) | 2 lines Remove numerix as nx from pylab ........ r4194 | mdboom | 2007-11-09 15:14:29 -0500 (Fri, 09 Nov 2007) | 2 lines Fix exception plotting an errorbar graph with only two data points. ........ r4195 | mdboom | 2007-11-09 15:15:52 -0500 (Fri, 09 Nov 2007) | 2 lines Bugfix: [ 1808189 ] lw kwarg broken in errorbar (Thanks Joe Monaco). ........ r4196 | dsdale | 2007-11-09 15:37:57 -0500 (Fri, 09 Nov 2007) | 2 lines minor formatting change to dependency report ........ r4197 | mdboom | 2007-11-09 15:59:47 -0500 (Fri, 09 Nov 2007) | 5 lines Bugfix: [ 1757315 ] ValueError: Cannot set nonpositive limits with log transform. The axes scales were not getting set back to "linear" when cla() is called, so autoscale_limits gets confused on the next call to plot(). ........ r4198 | mdboom | 2007-11-09 16:09:04 -0500 (Fri, 09 Nov 2007) | 5 lines Bugfix: [ 1745650 ] patch for mlab.py's comment handling Comment handling had the potential to lose the last character of a line. Slightly different from user submitted patch -- uses split() instead of three lines of Python code. ........ r4199 | mdboom | 2007-11-09 16:27:30 -0500 (Fri, 09 Nov 2007) | 3 lines Bugfix: [ 1732274 ] No antialiasing with pie on wxpython Reducing the sampling of the curve on the wedge looks much better. ........ r4200 | mdboom | 2007-11-09 16:28:58 -0500 (Fri, 09 Nov 2007) | 2 lines Oops in last commit. ........ r4214 | dsdale | 2007-11-10 18:08:19 -0500 (Sat, 10 Nov 2007) | 3 lines added flags in setup.cfg to disable providing external packages like pytz and datetime ........ r4215 | dsdale | 2007-11-10 18:10:15 -0500 (Sat, 10 Nov 2007) | 2 lines added a comment in setup.cfg, will rename to setup.cfg.template ........ r4216 | dsdale | 2007-11-10 18:20:44 -0500 (Sat, 10 Nov 2007) | 2 lines dont use spaces in setup.cfg section names ........ r4217 | dsdale | 2007-11-10 18:21:38 -0500 (Sat, 10 Nov 2007) | 3 lines moved setup.cfg to setup.cfg.template, so local modifications can be made without affecting the trunk ........ r4218 | dsdale | 2007-11-10 18:26:36 -0500 (Sat, 10 Nov 2007) | 2 lines expand comments in build report ........ svn path=/branches/transforms/; revision=4220
2 parents 8f400b9 + bdd36ad commit bb3ca0f

26 files changed

Lines changed: 206 additions & 124 deletions

‎examples/animation_blit_fltk.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import matplotlib
44
matplotlib.use('FltkAgg')
55
import pylab as p
6-
import numpy as nx
6+
import numpy as npy
77
import time
88

99

@@ -29,7 +29,7 @@ def update(self,ptr):
2929
self.background = self.canvas.copy_from_bbox(self.ax.bbox)
3030
self.canvas.restore_region(self.background)
3131
# update the data
32-
line.set_ydata(nx.sin(x+self.cnt/10.0))
32+
line.set_ydata(npy.sin(x+self.cnt/10.0))
3333
# just draw the animated artist
3434
self.ax.draw_artist(line)
3535
# just redraw the axes rectangle
@@ -45,8 +45,8 @@ def update(self,ptr):
4545
p.subplots_adjust(left=0.3, bottom=0.3) # check for flipy bugs
4646
p.grid() # to ensure proper background restore
4747
# create the initial line
48-
x = nx.arange(0,2*nx.pi,0.01)
49-
line, = p.plot(x, nx.sin(x), animated=True)
48+
x = npy.arange(0,2*npy.pi,0.01)
49+
line, = p.plot(x, npy.sin(x), animated=True)
5050
p.draw()
5151
anim=animator(ax)
5252

‎examples/annotation_demo.py‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,19 @@
3232
"""
3333

3434

35-
from pylab import figure, show, nx
35+
from matplotlib.pyplot import figure, show
3636
from matplotlib.patches import Ellipse
37+
import numpy as npy
38+
3739

3840
if 1:
3941
# if only one location is given, the text and xypoint being
4042
# annotated are assumed to be the same
4143
fig = figure()
4244
ax = fig.add_subplot(111, autoscale_on=False, xlim=(-1,5), ylim=(-3,5))
4345

44-
t = nx.arange(0.0, 5.0, 0.01)
45-
s = nx.cos(2*nx.pi*t)
46+
t = npy.arange(0.0, 5.0, 0.01)
47+
s = npy.cos(2*npy.pi*t)
4648
line, = ax.plot(t, s, lw=3, color='purple')
4749

4850
ax.annotate('axes center', xy=(.5, .5), xycoords='axes fraction',
@@ -85,8 +87,8 @@
8587
# respected
8688
fig = figure()
8789
ax = fig.add_subplot(111, polar=True)
88-
r = nx.arange(0,1,0.001)
89-
theta = 2*2*nx.pi*r
90+
r = npy.arange(0,1,0.001)
91+
theta = 2*2*npy.pi*r
9092
line, = ax.plot(theta, r, color='#ee8d18', lw=3)
9193

9294
ind = 800
@@ -115,8 +117,8 @@
115117
ax.add_artist(el)
116118
el.set_clip_box(ax.bbox)
117119
ax.annotate('the top',
118-
xy=(nx.pi/2., 10.), # theta, radius
119-
xytext=(nx.pi/3, 20.), # theta, radius
120+
xy=(npy.pi/2., 10.), # theta, radius
121+
xytext=(npy.pi/3, 20.), # theta, radius
120122
xycoords='polar',
121123
textcoords='polar',
122124
arrowprops=dict(facecolor='black', shrink=0.05),

‎examples/barcode_demo.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
from pylab import figure, show, cm, nx
1+
from matplotlib.pyplot import figure, show, cm
2+
from numpy import where
3+
from numpy.random import rand
24

35
# the bar
4-
x = nx.where(nx.mlab.rand(500)>0.7, 1.0, 0.0)
6+
x = where(rand(500)>0.7, 1.0, 0.0)
57

68
axprops = dict(xticks=[], yticks=[])
79
barprops = dict(aspect='auto', cmap=cm.binary, interpolation='nearest')
810

911
fig = figure()
1012

11-
# a vertical barcode
13+
# a vertical barcode -- this is broken at present
1214
x.shape = len(x), 1
1315
ax = fig.add_axes([0.1, 0.3, 0.1, 0.6], **axprops)
1416
ax.imshow(x, **barprops)

‎examples/broken_barh.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"""
33
Make a "broken" horizontal bar plot, ie one with gaps
44
"""
5-
from pylab import figure, show, nx
5+
from matplotlib.pyplot import figure, show
66

77
fig = figure()
88
ax = fig.add_subplot(111)

‎examples/clippath_test.py‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
from pylab import figure, show, nx
1+
from matplotlib.pyplot import figure, show
22
import matplotlib.transforms as transforms
33
from matplotlib.patches import RegularPolygon
44
import matplotlib.agg as agg
5-
5+
from numpy import arange, sin, pi
6+
from numpy.random import rand
67

78
class ClipWindow:
89
def __init__(self, ax, line):
@@ -47,9 +48,9 @@ def _clip(self):
4748

4849
fig = figure(figsize=(8,8))
4950
ax = fig.add_subplot(111)
50-
t = nx.arange(0.0, 4.0, 0.01)
51-
s = 2*nx.sin(2*nx.pi*8*t)
51+
t = arange(0.0, 4.0, 0.01)
52+
s = 2*sin(2*pi*8*t)
5253

53-
line, = ax.plot(t, 2*(nx.mlab.rand(len(t))-0.5), 'b-')
54+
line, = ax.plot(t, 2*(rand(len(t))-0.5), 'b-')
5455
clipwin = ClipWindow(ax, line)
5556
show()

‎examples/custom_figure_class.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""
22
You can pass a custom Figure constructor to figure if youy want to derive from the default Figure. This simple example creates a figure with a figure title
33
"""
4-
from pylab import figure, show, nx
4+
from matplotlib.pyplot import figure, show
55
from matplotlib.figure import Figure
66

77
class MyFigure(Figure):

‎examples/date_demo_convert.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
#!/usr/bin/env python
22

33
import datetime
4-
from pylab import figure, show, nx
4+
from matplotlib.pyplot import figure, show
55
from matplotlib.dates import DayLocator, HourLocator, DateFormatter, drange
6-
6+
from numpy import arange
77

88
date1 = datetime.datetime( 2000, 3, 2)
99
date2 = datetime.datetime( 2000, 3, 6)
1010
delta = datetime.timedelta(hours=6)
1111
dates = drange(date1, date2, delta)
1212

13-
y = nx.arange( len(dates)*1.0)
13+
y = arange( len(dates)*1.0)
1414

1515
fig = figure()
1616
ax = fig.add_subplot(111)
@@ -25,7 +25,7 @@
2525
# tick, not the base multiple
2626

2727
ax.xaxis.set_major_locator( DayLocator() )
28-
ax.xaxis.set_minor_locator( HourLocator(nx.arange(0,25,6)) )
28+
ax.xaxis.set_minor_locator( HourLocator(arange(0,25,6)) )
2929
ax.xaxis.set_major_formatter( DateFormatter('%Y-%m-%d') )
3030

3131
ax.fmt_xdata = DateFormatter('%Y-%m-%d %H:%M:%S')

‎examples/dynamic_collection.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import random
22
from matplotlib.collections import RegularPolyCollection
33
import matplotlib.cm as cm
4-
from pylab import figure, show, nx
4+
from matplotlib.pyplot import figure, show
5+
from numpy.random import rand
56

67
fig = figure()
78
ax = fig.add_subplot(111, xlim=(0,1), ylim=(0,1), autoscale_on=False)
@@ -29,8 +30,8 @@ def onpress(event):
2930
press 'a' to add a random point from the collection, 'd' to delete one
3031
"""
3132
if event.key=='a':
32-
x,y = nx.mlab.rand(2)
33-
color = cm.jet(nx.mlab.rand())
33+
x,y = rand(2)
34+
color = cm.jet(rand())
3435
offsets.append((x,y))
3536
facecolors.append(color)
3637
fig.canvas.draw()

‎examples/fill_demo2.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
from pylab import figure, nx, show
1+
from matplotlib.pyplot import figure, show
2+
from numpy import arange, sin, pi
3+
24
fig = figure()
35
ax = fig.add_subplot(111)
4-
t = nx.arange(0.0,3.01,0.01)
5-
s = nx.sin(2*nx.pi*t)
6-
c = nx.sin(4*nx.pi*t)
6+
t = arange(0.0,3.01,0.01)
7+
s = sin(2*pi*t)
8+
c = sin(4*pi*t)
79
ax.fill(t, s, 'b', t, c, 'g', alpha=0.2)
810
show()

‎examples/gradient_bar.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
from pylab import figure, show, nx, cm
1+
from matplotlib.pyplot import figure, show, cm
2+
from numpy import arange
3+
from numpy.random import rand
24

35
def gbar(ax, x, y, width=0.5, bottom=0):
46
X = [[.6, .6],[.7,.7]]
@@ -19,8 +21,8 @@ def gbar(ax, x, y, width=0.5, bottom=0):
1921
extent=(xmin, xmax, ymin, ymax), alpha=1)
2022

2123
N = 10
22-
x = nx.arange(N)+0.25
23-
y = nx.mlab.rand(N)
24+
x = arange(N)+0.25
25+
y = rand(N)
2426
gbar(ax, x, y, width=0.7)
2527
ax.set_aspect('normal')
2628
show()

0 commit comments

Comments
 (0)