matplotlib-checkins Mailing List for matplotlib

Revision: 8894
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8894&view=rev
Author: jdh2358
Date: 2011年01月05日 22:20:09 +0000 (2011年1月05日)
Log Message:
-----------
fix plot directive to use rc file defaults
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
Modified: trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py	2011年01月05日 22:04:47 UTC (rev 8893)
+++ trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py	2011年01月05日 22:20:09 UTC (rev 8894)
@@ -265,10 +265,7 @@
 
 def clear_state():
 plt.close('all')
- matplotlib.rcdefaults()
- # Set a default figure size that doesn't overflow typical browser
- # windows. The script is free to override it if necessary.
- matplotlib.rcParams['figure.figsize'] = (5.5, 4.5)
+ matplotlib.rc_file_defaults()
 
 def render_figures(plot_path, function_name, plot_code, tmpdir, destdir,
 formats, context=False):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8893
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8893&view=rev
Author: jdh2358
Date: 2011年01月05日 22:04:47 +0000 (2011年1月05日)
Log Message:
-----------
bumpt the rc version num
Modified Paths:
--------------
 branches/v1_0_maint/doc/pyplots/tex_demo.png
 branches/v1_0_maint/lib/matplotlib/__init__.py
Modified: branches/v1_0_maint/doc/pyplots/tex_demo.png
===================================================================
(Binary files differ)
Modified: branches/v1_0_maint/lib/matplotlib/__init__.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/__init__.py	2011年01月05日 18:14:36 UTC (rev 8892)
+++ branches/v1_0_maint/lib/matplotlib/__init__.py	2011年01月05日 22:04:47 UTC (rev 8893)
@@ -99,7 +99,7 @@
 """
 from __future__ import generators
 
-__version__ = '1.0.1rc1'
+__version__ = '1.0.1rc2'
 __revision__ = '$Revision$'
 __date__ = '$Date$'
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8892
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8892&view=rev
Author: jdh2358
Date: 2011年01月05日 18:14:36 +0000 (2011年1月05日)
Log Message:
-----------
remove unused params from doc rc; add comment on examples.download params
Modified Paths:
--------------
 branches/v1_0_maint/doc/matplotlibrc
Modified: branches/v1_0_maint/doc/matplotlibrc
===================================================================
--- branches/v1_0_maint/doc/matplotlibrc	2011年01月05日 17:44:17 UTC (rev 8891)
+++ branches/v1_0_maint/doc/matplotlibrc	2011年01月05日 18:14:36 UTC (rev 8892)
@@ -1,318 +1,13 @@
-### MATPLOTLIBRC FORMAT
-
-# This is a sample matplotlib configuration file. It should be placed
-# in HOME/.matplotlib/matplotlibrc (unix/linux like systems) and
-# C:\Documents and Settings\yourname\.matplotlib (win32 systems)
-#
-# By default, the installer will overwrite the existing file in the
-# install path, so if you want to preserve your's, please move it to
-# your HOME dir and set the environment variable if necessary.
-#
-# This file is best viewed in a editor which supports python mode
-# syntax highlighting
-#
-# Blank lines, or lines starting with a comment symbol, are ignored,
-# as are trailing comments. Other lines must have the format
-#
-# key : val # optional comment
-#
-# Colors: for the color values below, you can either use
-# - a matplotlib color string, such as r, k, or b
-# - an rgb tuple, such as (1.0, 0.5, 0.0)
-# - a hex string, such as ff00ff (no '#' symbol)
-# - a scalar grayscale intensity such as 0.75
-# - a legal html color name, eg red, blue, darkslategray
-
-#### CONFIGURATION BEGINS HERE
-# the default backend; one of GTK GTKAgg GTKCairo FltkAgg QtAgg TkAgg
-# WX WXAgg Agg Cairo GD GDK Paint PS PDF SVG Template
 backend : Agg
-#maskedarray : False # True to use external maskedarray module
- # instead of numpy.ma; this is a temporary
- # setting for testing maskedarray.
-#interactive : False # see http://matplotlib.sourceforge.net/interactive.html
-#toolbar : toolbar2 # None | classic | toolbar2
-#timezone : UTC # a pytz timezone string, eg US/Central or Europe/Paris
 
-# Where your matplotlib data lives if you installed to a non-default
-# location. This is where the matplotlib fonts, bitmaps, etc reside
-#datapath : /home/jdhunter/mpldata
-
-
-### LINES
-# See http://matplotlib.sourceforge.net/matplotlib.lines.html for more
-# information on line properties.
-lines.linewidth : 1.5 # line width in points
-#lines.linestyle : - # solid line
-#lines.color : blue
-#lines.marker : None # the default marker
-#lines.markeredgewidth : 0.5 # the line width around the marker symbol
-#lines.markersize : 6 # markersize, in points
-#lines.dash_joinstyle : miter # miter|round|bevel
-#lines.dash_capstyle : butt # butt|round|projecting
-#lines.solid_joinstyle : miter # miter|round|bevel
-#lines.solid_capstyle : projecting # butt|round|projecting
-#lines.antialiased : True # render lines in antialised (no jaggies)
-
-### PATCHES
-# Patches are graphical objects that fill 2D space, like polygons or
-# circles. See
-# http://matplotlib.sourceforge.net/matplotlib.patches.html for more
-# information on patch properties
-#patch.linewidth 	: 1.0 # edge width in points
-#patch.facecolor 	: blue
-#patch.edgecolor 	: black
-#patch.antialiased 	: True # render patches in antialised (no jaggies)
-
-### FONT
-#
-# font properties used by text.Text. See
-# http://matplotlib.sourceforge.net/matplotlib.font_manager.html for more
-# information on font properties. The 6 font properties used for font
-# matching are given below with their default values.
-#
-# The font.family property has five values: 'serif' (e.g. Times),
-# 'sans-serif' (e.g. Helvetica), 'cursive' (e.g. Zapf-Chancery),
-# 'fantasy' (e.g. Western), and 'monospace' (e.g. Courier). Each of
-# these font families has a default list of font names in decreasing
-# order of priority associated with them.
-#
-# The font.style property has three values: normal (or roman), italic
-# or oblique. The oblique style will be used for italic, if it is not
-# present.
-#
-# The font.variant property has two values: normal or small-caps. For
-# TrueType fonts, which are scalable fonts, small-caps is equivalent
-# to using a font size of 'smaller', or about 83% of the current font
-# size.
-#
-# The font.weight property has effectively 13 values: normal, bold,
-# bolder, lighter, 100, 200, 300, ..., 900. Normal is the same as
-# 400, and bold is 700. bolder and lighter are relative values with
-# respect to the current weight.
-#
-# The font.stretch property has 11 values: ultra-condensed,
-# extra-condensed, condensed, semi-condensed, normal, semi-expanded,
-# expanded, extra-expanded, ultra-expanded, wider, and narrower. This
-# property is not currently implemented.
-#
-# The font.size property is the default font size for text, given in pts.
-# 12pt is the standard value.
-#
-#font.family : sans-serif
-#font.style : normal
-#font.variant : normal
-#font.weight : medium
-#font.stretch : normal
-# note that font.size controls default text sizes. To configure
-# special text sizes tick labels, axes, labels, title, etc, see the rc
-# settings for axes and ticks. Special text sizes can be defined
-# relative to font.size, using the following values: xx-small, x-small,
-# small, medium, large, x-large, xx-large, larger, or smaller
-#font.size : 12.0
-#font.serif : Bitstream Vera Serif, New Century Schoolbook, Century Schoolbook L, Utopia, ITC Bookman, Bookman, Nimbus Roman No9 L, Times New Roman, Times, Palatino, Charter, serif
-#font.sans-serif : Bitstream Vera Sans, Lucida Grande, Verdana, Geneva, Lucid, Arial, Helvetica, Avant Garde, sans-serif
-#font.cursive : Apple Chancery, Textile, Zapf Chancery, Sand, cursive
-#font.fantasy : Comic Sans MS, Chicago, Charcoal, Impact, Western, fantasy
-#font.monospace : Bitstream Vera Sans Mono, Andale Mono, Nimbus Mono L, Courier New, Courier, Fixed, Terminal, monospace
-
-### TEXT
-# text properties used by text.Text. See
-# http://matplotlib.sourceforge.net/matplotlib.text.html for more
-# information on text properties
-
-#text.color : black
-
-### LaTeX customizations. See http://www.scipy.org/Wiki/Cookbook/Matplotlib/UsingTex
-#text.usetex : False # use latex for all text handling. The following fonts
- # are supported through the usual rc parameter settings:
- # new century schoolbook, bookman, times, palatino,
- # zapf chancery, charter, serif, sans-serif, helvetica,
- # avant garde, courier, monospace, computer modern roman,
- # computer modern sans serif, computer modern typewriter
- # If another font is desired which can loaded using the
- # LaTeX \usepackage command, please inquire at the
- # matplotlib mailing list
-#text.latex.unicode : False # use "ucs" and "inputenc" LaTeX packages for handling
- # unicode strings.
-#text.latex.preamble : # IMPROPER USE OF THIS FEATURE WILL LEAD TO LATEX FAILURES
- # AND IS THEREFORE UNSUPPORTED. PLEASE DO NOT ASK FOR HELP
- # IF THIS FEATURE DOES NOT DO WHAT YOU EXPECT IT TO.
- # preamble is a comma separated list of LaTeX statements
- # that are included in the LaTeX document preamble.
- # An example:
- # text.latex.preamble : \usepackage{bm},\usepackage{euler}
- # The following packages are always loaded with usetex, so
- # beware of package collisions: color, geometry, graphicx,
- # type1cm, textcomp. Adobe Postscript (PSSNFS) font packages
- # may also be loaded, depending on your font settings
-#text.dvipnghack : False # some versions of dvipng don't handle
- # alpha channel properly. Use True to correct and flush
- # ~/.matplotlib/tex.cache before testing
-#text.markup : 'plain' # Affects how text, such as titles and labels, are
- # interpreted by default.
- # 'plain': As plain, unformatted text
-				# 'tex': As TeX-like text. Text between $'s will be
-				# formatted as a TeX math expression.
-				# This setting has no effect when text.usetex is True.
-				# In that case, all text will be sent to TeX for
-				# processing.
-
-# The following settings allow you to select the fonts in math mode.
-# They map from a TeX font name to a fontconfig font pattern.
-# These settings are only used if mathtext.fontset is 'custom'.
-#mathtext.cal : cursive
-#mathtext.rm : serif
-#mathtext.tt : monospace
-#mathtext.it : serif:italic
-#mathtext.bf : serif:bold
-#mathtext.sf : sans
-#mathtext.fontset : cm # Should be 'cm' (Computer Modern), 'stix',
- # 'stixsans' or 'custom'
-#mathtext.fallback_to_cm : True # When True, use symbols from the Computer Modern
-			 # fonts when a symbol can not be found in one of
-				 # the custom math fonts.
-
-### AXES
-# default face and edge color, default tick sizes,
-# default fontsizes for ticklabels, and so on. See
-# http://matplotlib.sourceforge.net/matplotlib.axes.html#Axes
-#axes.hold : True # whether to clear the axes by default on
-#axes.facecolor : white # axes background color
-#axes.edgecolor : black # axes edge color
-#axes.linewidth : 1.0 # edge linewidth
-#axes.grid : False # display grid or not
-#axes.titlesize : 14 # fontsize of the axes title
-#axes.labelsize : 12 # fontsize of the x any y labels
-#axes.labelcolor : black
-#axes.axisbelow : False # whether axis gridlines and ticks are below
- # the axes elements (lines, text, etc)
-#axes.formatter.limits : -7, 7 # use scientific notation if log10
- # of the axis range is smaller than the
- # first or larger than the second
-
-#polaraxes.grid : True # display grid on polar axes
-
-### TICKS
-# see http://matplotlib.sourceforge.net/matplotlib.axis.html#Ticks
-#xtick.major.size : 4 # major tick size in points
-#xtick.minor.size : 2 # minor tick size in points
-#xtick.major.pad : 4 # distance to major tick label in points
-#xtick.minor.pad : 4 # distance to the minor tick label in points
-#xtick.color : k # color of the tick labels
-#xtick.labelsize : 12 # fontsize of the tick labels
-#xtick.direction : in # direction: in or out
-
-#ytick.major.size : 4 # major tick size in points
-#ytick.minor.size : 2 # minor tick size in points
-#ytick.major.pad : 4 # distance to major tick label in points
-#ytick.minor.pad : 4 # distance to the minor tick label in points
-#ytick.color : k # color of the tick labels
-#ytick.labelsize : 12 # fontsize of the tick labels
-#ytick.direction : in # direction: in or out
-
-
-### GRIDS
-#grid.color : black # grid color
-#grid.linestyle : : # dotted
-#grid.linewidth : 0.5 # in points
-
-### Legend
-#legend.isaxes : True
-#legend.numpoints : 2 # the number of points in the legend line
-#legend.fontsize : 14
-#legend.pad : 0.2 # the fractional whitespace inside the legend border
-#legend.markerscale : 1.0 # the relative size of legend markers vs. original
-# the following dimensions are in axes coords
-#legend.labelsep : 0.010 # the vertical space between the legend entries
-#legend.handlelen : 0.05 # the length of the legend lines
-#legend.handletextsep : 0.02 # the space between the legend line and legend text
-#legend.axespad : 0.02 # the border between the axes and legend edge
-#legend.shadow : False
-
-### FIGURE
-# See http://matplotlib.sourceforge.net/matplotlib.figure.html#Figure
 figure.figsize : 5.5, 4.5 # figure size in inches
-#figure.dpi : 80 # figure dots per inch
-#figure.facecolor : 0.75 # figure facecolor; 0.75 is scalar gray
-#figure.edgecolor : white # figure edgecolor
-
-# The figure subplot parameters. All dimensions are fraction of the
-# figure width or height
-figure.subplot.left : 0.2 # the left side of the subplots of the figure
-#figure.subplot.right : 0.9 # the right side of the subplots of the figure
-figure.subplot.bottom : 0.1 # the bottom of the subplots of the figure
-#figure.subplot.top : 0.9 # the top of the subplots of the figure
-#figure.subplot.wspace : 0.2 # the amount of width reserved for blank space between subplots
-#figure.subplot.hspace : 0.2 # the amount of height reserved for white space between subplots
-
-#figure.autolayout : False # when True, adjust the axes so that text doesn't overlap
-
-### IMAGES
-#image.aspect : equal # equal | auto | a number
-#image.interpolation : bilinear # see help(imshow) for options
-#image.cmap : jet # gray | jet etc...
-#image.lut : 256 # the size of the colormap lookup table
-#image.origin : upper # lower | upper
-
-
-### CONTOUR PLOTS
-#contour.negative_linestyle : dashed # dashed | solid
-
-### SAVING FIGURES
-# the default savefig params can be different for the GUI backends.
-# Eg, you may want a higher resolution, or to make the figure
-# background white
 savefig.dpi : 80 # figure dots per inch
-#savefig.facecolor : white # figure facecolor when saving
-#savefig.edgecolor : white # figure edgecolor when saving
-
-#cairo.format : png # png, ps, pdf, svg
-
-# tk backend params
-#tk.window_focus : False # Maintain shell focus for TkAgg
-#tk.pythoninspect : False # tk sets PYTHONINSEPCT
-
-# ps backend params
-#ps.papersize : letter # auto, letter, legal, ledger, A0-A10, B0-B10
-#ps.useafm : False # use of afm fonts, results in small files
-#ps.usedistiller : False # can be: None, ghostscript or xpdf
- # Experimental: may produce smaller files.
- # xpdf intended for production of publication quality files,
- # but requires ghostscript, xpdf and ps2eps
-#ps.distiller.res : 6000 # dpi
-#ps.fonttype : 3 # Output Type 3 (Type3) or Type 42 (TrueType)
-
-# pdf backend params
-#pdf.compression : 6 # integer from 0 to 9
- # 0 disables compression (good for debugging)
-#pdf.fonttype : 3 # Output Type 3 (Type3) or Type 42 (TrueType)
-
-# svg backend params
-#svg.image_inline : True # write raster image data directly into the svg file
-#svg.image_noscale : False # suppress scaling of raster data embedded in SVG
-#svg.embed_chars : True # embed character outlines in the SVG file
-
-# docstring params
 docstring.hardcopy : True # set this when you want to generate hardcopy docstring
 
-# Set the verbose flags. This controls how much information
-# matplotlib gives you at runtime and where it goes. The verbosity
-# levels are: silent, helpful, debug, debug-annoying. Any level is
-# inclusive of all the levels below it. If you setting is debug,
-# you'll get all the debug and helpful messages. When submitting
-# problems to the mailing-list, please set verbose to helpful or debug
-# and paste the output into your report.
-#
-# The fileo gives the destination for any calls to verbose.report.
-# These objects can a filename, or a filehandle like sys.stdout.
-#
-# You can override the rc default verbosity from the command line by
-# giving the flags --verbose-LEVEL where LEVEL is one of the legal
-# levels, eg --verbose-helpful.
-#
-# You can access the verbose instance in your code
-# from matplotlib import verbose.
+# these parameters are useful for packagers who want to build the docs
+# w/o invoking file downloads for the sampledata (see
+# matplotlib.cbook.get_sample_data. Unpack
+# mpl_sampledata-VERSION.tar.gz and point examples.directory to it.
 
-#verbose.level : silent # one of silent, helpful, debug, debug-annoying
-#verbose.fileo : sys.stdout # a log filename, sys.stdout or sys.stderr
+#examples.download : False # False to bypass downloading mechanism
+#examples.directory : /home/titan/johnh/python/svn/matplotlib.trunk/sample_data/ # directory to look in if download is false
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8891
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8891&view=rev
Author: weathergod
Date: 2011年01月05日 17:44:17 +0000 (2011年1月05日)
Log Message:
-----------
Applying a similar fix to r8873 which seemed to only have been applied to the development branch.
This fixes a math domain error when using log scales.
Modified Paths:
--------------
 branches/v1_0_maint/lib/matplotlib/ticker.py
Modified: branches/v1_0_maint/lib/matplotlib/ticker.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/ticker.py	2011年01月05日 16:29:53 UTC (rev 8890)
+++ branches/v1_0_maint/lib/matplotlib/ticker.py	2011年01月05日 17:44:17 UTC (rev 8891)
@@ -1194,7 +1194,7 @@
 return False
 if x == 0.0:
 return True
- lx = math.log(x)/math.log(base)
+ lx = math.log(abs(x))/math.log(base)
 return is_close_to_int(lx)
 
 def is_close_to_int(x):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8890
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8890&view=rev
Author: jswhit
Date: 2011年01月05日 16:29:53 +0000 (2011年1月05日)
Log Message:
-----------
fix colorbar tick labels.
Modified Paths:
--------------
 trunk/toolkits/basemap/examples/plotprecip.py
Modified: trunk/toolkits/basemap/examples/plotprecip.py
===================================================================
--- trunk/toolkits/basemap/examples/plotprecip.py	2011年01月05日 15:59:33 UTC (rev 8889)
+++ trunk/toolkits/basemap/examples/plotprecip.py	2011年01月05日 16:29:53 UTC (rev 8890)
@@ -57,7 +57,7 @@
 l, b, w, h = pos.bounds
 cax = plt.axes([l+w+0.025, b, 0.025, h]) # setup colorbar axes
 # draw colorbar.
-plt.colorbar(cs, cax, format='%g', ticks=clevs, drawedges=False) 
+cb = plt.colorbar(cs, cax, format='%g', ticks=clevs, drawedges=False) 
 plt.axes(ax) # make the original axes current again
 # plot title
 plt.title(plottitle+'- contourf',fontsize=10)
@@ -85,11 +85,11 @@
 # using im2, not im (hack to prevent colors from being
 # too compressed at the low end on the colorbar - results
 # from highly nonuniform colormap)
-plt.colorbar(im2, cax, format='%d') # draw colorbar
+cb = plt.colorbar(im2, cax, format='%d') # draw colorbar
 plt.axes(ax) # make the original axes current again
 # reset colorbar tick labels (hack to get
-cax.set_yticks(np.linspace(0,1,len(clevs)))
-cax.set_yticklabels(['%g' % clev for clev in clevs])
+cb.set_ticks(np.linspace(clevs[0],clevs[-1],len(clevs)))
+cb.set_ticklabels(['%g' % clev for clev in clevs])
 # plot title
 plt.title(plottitle+' - imshow',fontsize=10)
 plt.show() # display onscreen.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8889
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8889&view=rev
Author: jdh2358
Date: 2011年01月05日 15:59:33 +0000 (2011年1月05日)
Log Message:
-----------
fix rc file defaults issue for docs; python 2.4 compliance for formlayout
Modified Paths:
--------------
 branches/v1_0_maint/doc/matplotlibrc
 branches/v1_0_maint/lib/matplotlib/__init__.py
 branches/v1_0_maint/lib/matplotlib/backends/qt4_editor/formlayout.py
Modified: branches/v1_0_maint/doc/matplotlibrc
===================================================================
--- branches/v1_0_maint/doc/matplotlibrc	2011年01月05日 15:43:30 UTC (rev 8888)
+++ branches/v1_0_maint/doc/matplotlibrc	2011年01月05日 15:59:33 UTC (rev 8889)
@@ -232,7 +232,7 @@
 
 ### FIGURE
 # See http://matplotlib.sourceforge.net/matplotlib.figure.html#Figure
-figure.figsize : 6, 4 # figure size in inches
+figure.figsize : 5.5, 4.5 # figure size in inches
 #figure.dpi : 80 # figure dots per inch
 #figure.facecolor : 0.75 # figure facecolor; 0.75 is scalar gray
 #figure.edgecolor : white # figure edgecolor
Modified: branches/v1_0_maint/lib/matplotlib/__init__.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/__init__.py	2011年01月05日 15:43:30 UTC (rev 8888)
+++ branches/v1_0_maint/lib/matplotlib/__init__.py	2011年01月05日 15:59:33 UTC (rev 8889)
@@ -762,6 +762,7 @@
 
 # this is the instance used by the matplotlib classes
 rcParams = rc_params()
+rcParamsOrig = rcParams.copy()
 
 rcParamsDefault = RcParams([ (key, default) for key, (default, converter) in \
 defaultParams.iteritems() ])
@@ -843,11 +844,19 @@
 
 def rcdefaults():
 """
- Restore the default rc params - the ones that were created at
- matplotlib load time.
+ Restore the default rc params - these are not the params loaded by
+ the rc file, but mpl's internal params. See rc_file_defaults for
+ reloading the default params from the rc file
 """
 rcParams.update(rcParamsDefault)
 
+def rc_file_defaults():
+ """
+ Restore the default rc params from the original matplotlib rc that
+ was loaded
+ """
+ rcParams.update(rcParamsOrig)
+
 _use_error_msg = """ This call to matplotlib.use() has no effect
 because the the backend has already been chosen;
 matplotlib.use() must be called *before* pylab, matplotlib.pyplot,
Modified: branches/v1_0_maint/lib/matplotlib/backends/qt4_editor/formlayout.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/backends/qt4_editor/formlayout.py	2011年01月05日 15:43:30 UTC (rev 8888)
+++ branches/v1_0_maint/lib/matplotlib/backends/qt4_editor/formlayout.py	2011年01月05日 15:59:33 UTC (rev 8889)
@@ -272,7 +272,11 @@
 field.setCurrentIndex(selindex)
 elif isinstance(value, bool):
 field = QCheckBox(self)
- field.setCheckState(Qt.Checked if value else Qt.Unchecked)
+ if value:
+ field.setCheckState(Qt.Checked)
+ else:
+ field.setCheckedState(Qt.Unchecked)
+ 
 elif isinstance(value, float):
 field = QLineEdit(repr(value), self)
 elif isinstance(value, int):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8888
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8888&view=rev
Author: leejjoon
Date: 2011年01月05日 15:43:30 +0000 (2011年1月05日)
Log Message:
-----------
gridspec.GridSpecBase.__getitem__ checks its index (original patch from Paul Ivanov)
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/gridspec.py
Modified: trunk/matplotlib/lib/matplotlib/gridspec.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/gridspec.py	2011年01月05日 15:43:01 UTC (rev 8887)
+++ trunk/matplotlib/lib/matplotlib/gridspec.py	2011年01月05日 15:43:30 UTC (rev 8888)
@@ -145,6 +145,8 @@
 else:
 if k1 < 0:
 k1 += nrows
+ if k1 >= nrows or k1 < 0 :
+ raise IndexError("index out of range")
 row1, row2 = k1, k1+1
 
 
@@ -153,6 +155,8 @@
 else:
 if k2 < 0:
 k2 += ncols
+ if k2 >= ncols or k2 < 0 :
+ raise IndexError("index out of range")
 col1, col2 = k2, k2+1
 
 
@@ -167,6 +171,8 @@
 else:
 if key < 0:
 key += total
+ if key >= total or key < 0 :
+ raise IndexError("index out of range")
 num1, num2 = key, None
 
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8887
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8887&view=rev
Author: leejjoon
Date: 2011年01月05日 15:43:01 +0000 (2011年1月05日)
Log Message:
-----------
improve demo_axes_hbox_divider.py
Modified Paths:
--------------
 trunk/matplotlib/examples/axes_grid/demo_axes_hbox_divider.py
Modified: trunk/matplotlib/examples/axes_grid/demo_axes_hbox_divider.py
===================================================================
--- trunk/matplotlib/examples/axes_grid/demo_axes_hbox_divider.py	2011年01月05日 13:31:24 UTC (rev 8886)
+++ trunk/matplotlib/examples/axes_grid/demo_axes_hbox_divider.py	2011年01月05日 15:43:01 UTC (rev 8887)
@@ -3,7 +3,7 @@
 from mpl_toolkits.axes_grid1.axes_divider import HBoxDivider
 import mpl_toolkits.axes_grid1.axes_size as Size
 
-def make_heights_equal(fig, ax1, ax2, pad):
+def make_heights_equal(fig, rect, ax1, ax2, pad):
 # pad in inches
 
 h1, v1 = Size.AxesX(ax1), Size.AxesY(ax1)
@@ -12,7 +12,7 @@
 pad_v = Size.Scaled(1)
 pad_h = Size.Fixed(pad)
 
- my_divider = HBoxDivider(fig, 111,
+ my_divider = HBoxDivider(fig, rect,
 horizontal=[h1, pad_h, h2],
 vertical=[v1, pad_v, v2])
 
@@ -33,9 +33,10 @@
 
 ax1.imshow(arr1, interpolation="nearest")
 ax2.imshow(arr2, interpolation="nearest")
+
+ rect = 111 # subplot param for combined axes
+ make_heights_equal(fig1, rect, ax1, ax2, pad=0.5) # pad in inches
 
- make_heights_equal(fig1, ax1, ax2, pad=0.5)
- 
 for ax in [ax1, ax2]:
 ax.locator_params(nbins=4)
 
@@ -43,6 +44,9 @@
 ax3 = plt.axes([0.5, 0.5, 0.001, 0.001], frameon=False)
 ax3.xaxis.set_visible(False)
 ax3.yaxis.set_visible(False)
- ax3.annotate("Location of two axes are adjusted\n so that they have an equal height\n while maintaining their aspect ratios", (0.5, 0.5),
+ ax3.annotate("Location of two axes are adjusted\n so that they have equal heights\n while maintaining their aspect ratios", (0.5, 0.5),
 xycoords="axes fraction", va="center", ha="center",
- bbox=dict(fc="w"))
+ bbox=dict(boxstyle="round, pad=1", fc="w"))
+
+ plt.show()
+ 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8886
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8886&view=rev
Author: mdehoon
Date: 2011年01月05日 13:31:24 +0000 (2011年1月05日)
Log Message:
-----------
Replace MacOS.WMAvailable, as the MacOS module is not available with 64-bit Pythons, and deprecated for Python 3.
Modified Paths:
--------------
 branches/v1_0_maint/lib/matplotlib/backends/backend_macosx.py
 branches/v1_0_maint/src/_macosx.m
Modified: branches/v1_0_maint/lib/matplotlib/backends/backend_macosx.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/backends/backend_macosx.py	2011年01月04日 22:43:44 UTC (rev 8885)
+++ branches/v1_0_maint/lib/matplotlib/backends/backend_macosx.py	2011年01月05日 13:31:24 UTC (rev 8886)
@@ -2,7 +2,6 @@
 
 import os
 import numpy
-import MacOS
 
 from matplotlib._pylab_helpers import Gcf
 from matplotlib.backend_bases import RendererBase, GraphicsContextBase,\
@@ -229,7 +228,7 @@
 """
 Create a new figure manager instance
 """
- if not MacOS.WMAvailable():
+ if not _macosx.verify_main_display():
 import warnings
 warnings.warn("Python is not installed as a framework. The MacOSX backend may not work correctly if Python is not installed as a framework. Please see the Python documentation for more information on installing Python as a framework on Mac OS X")
 FigureClass = kwargs.pop('FigureClass', Figure)
Modified: branches/v1_0_maint/src/_macosx.m
===================================================================
--- branches/v1_0_maint/src/_macosx.m	2011年01月04日 22:43:44 UTC (rev 8885)
+++ branches/v1_0_maint/src/_macosx.m	2011年01月05日 13:31:24 UTC (rev 8886)
@@ -4399,16 +4399,6 @@
 return Py_None;
 }
 
-static char show__doc__[] = "Show all the figures and enter the main loop.\nThis function does not return until all Matplotlib windows are closed,\nand is normally not needed in interactive sessions.";
-
-static PyObject*
-show(PyObject* self)
-{
- if(nwin > 0) [NSApp run];
- Py_INCREF(Py_None);
- return Py_None;
-}
-
 @implementation Window
 - (Window*)initWithContentRect:(NSRect)rect styleMask:(unsigned int)mask backing:(NSBackingStoreType)bufferingType defer:(BOOL)deferCreation withManager: (PyObject*)theManager
 {
@@ -5139,11 +5129,32 @@
 }
 @end
 
+
+static PyObject*
+show(PyObject* self)
+{
+ if(nwin > 0) [NSApp run];
+ Py_INCREF(Py_None);
+ return Py_None;
+}
+
+static PyObject*
+verify_main_display(PyObject* self)
+{
+ CGDirectDisplayID display = CGMainDisplayID();
+ if (display == 0) {
+ PyErr_SetString(PyExc_RuntimeError, "Failed to obtain the display ID of the main display");
+ return NULL;
+ }
+ Py_INCREF(Py_True);
+ return Py_True;
+}
+
 static struct PyMethodDef methods[] = {
 {"show",
 (PyCFunction)show,
 METH_NOARGS,
- show__doc__
+ "Show all the figures and enter the main loop.\nThis function does not return until all Matplotlib windows are closed,\nand is normally not needed in interactive sessions."
 },
 {"choose_save_file",
 (PyCFunction)choose_save_file,
@@ -5155,11 +5166,17 @@
 METH_VARARGS,
 "Sets the active cursor."
 },
+ {"verify_main_display",
+ (PyCFunction)verify_main_display,
+ METH_NOARGS,
+ "Verifies if the main display can be found. This function fails if Python is not built as a framework."
+ },
 {NULL, NULL, 0, NULL}/* sentinel */
 };
 
 void init_macosx(void)
 { PyObject *m;
+
 import_array();
 
 if (PyType_Ready(&GraphicsContextType) < 0) return;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.