SF.net SVN: matplotlib: [5213] branches/v0_91_maint/lib/matplotlib
Revision: 5213
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5213&view=rev
Author: jdh2358
Date: 2008-05-22 07:21:10 -0700 (Thu, 22 May 2008)
Log Message:
---
applied stans wx figsize patch
Modified Paths:
--
branches/v0_91_maint/lib/matplotlib/backends/backend_wx.py
branches/v0_91_maint/lib/matplotlib/figure.py
Modified: branches/v0_91_maint/lib/matplotlib/backends/backend_wx.py
===
--- branches/v0_91_maint/lib/matplotlib/backends/backend_wx.py 2008-05-21
16:08:26 UTC (rev 5212)
+++ branches/v0_91_maint/lib/matplotlib/backends/backend_wx.py 2008-05-22
14:21:10 UTC (rev 5213)
@@ -1286,14 +1286,15 @@
pos =wx.Point(20,20)
l,b,w,h = fig.bbox.get_bounds()
wx.Frame.__init__(self, parent=None, id=-1, pos=pos,
- title="Figure %d" % num,
- size=(w,h))
+ title="Figure %d" % num)
+# Frame will be sized later by the Fit method
DEBUG_MSG("__init__()", 1, self)
self.num = num
statbar = StatusBarWx(self)
self.SetStatusBar(statbar)
self.canvas = self.get_canvas(fig)
+self.canvas.SetInitialSize(wx.Size(fig.bbox.width(),
fig.bbox.height()))
self.sizer =wx.BoxSizer(wx.VERTICAL)
self.sizer.Add(self.canvas, 1, wx.TOP | wx.LEFT | wx.EXPAND)
# By adding toolbar in sizer, we are able to put it at the bottom
@@ -1412,6 +1413,11 @@
def set_window_title(self, title):
self.window.SetTitle(title)
+def resize(self, width, height)
+'Set the canvas size in pixels'
+self.canvas.SetInitialSize(wx.Size(width, height))
+self.window.GetSizer().Fit(self.window)
+
# Identifiers for toolbar controls - images_wx contains bitmaps for the images
# used in the controls. wxWindows does not provide any stock images, so I've
# 'stolen' those from GTK2, and transformed them into the appropriate format.
Modified: branches/v0_91_maint/lib/matplotlib/figure.py
===
--- branches/v0_91_maint/lib/matplotlib/figure.py 2008-05-21 16:08:26 UTC
(rev 5212)
+++ branches/v0_91_maint/lib/matplotlib/figure.py 2008-05-22 14:21:10 UTC
(rev 5213)
@@ -327,6 +327,7 @@
from the shell
WARNING: forward=True is broken on all backends except GTK*
+and WX*
ACCEPTS: a w,h tuple with w,h in inches
"""
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/vse012070mrt/direct/01/
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib: [5214] trunk/matplotlib
Revision: 5214
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5214&view=rev
Author: jdh2358
Date: 2008-05-22 07:32:56 -0700 (Thu, 22 May 2008)
Log Message:
---
Merged revisions 5211,5213 via svnmerge from
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_91_maint
r5211 | mdboom | 2008-05-21 08:06:51 -0500 (Wed, 21 May 2008) | 2 lines
Backport TkAgg segfault fix.
r5213 | jdh2358 | 2008-05-22 09:21:10 -0500 (Thu, 22 May 2008) | 1 line
applied stans wx figsize patch
Modified Paths:
--
trunk/matplotlib/CHANGELOG
trunk/matplotlib/lib/matplotlib/backends/backend_wx.py
trunk/matplotlib/lib/matplotlib/figure.py
Property Changed:
trunk/matplotlib/
Property changes on: trunk/matplotlib
___
Name: svnmerge-integrated
- /branches/v0_91_maint:1-5207
+ /branches/v0_91_maint:1-5213
Modified: trunk/matplotlib/CHANGELOG
===
--- trunk/matplotlib/CHANGELOG 2008-05-22 14:21:10 UTC (rev 5213)
+++ trunk/matplotlib/CHANGELOG 2008-05-22 14:32:56 UTC (rev 5214)
@@ -1,3 +1,5 @@
+2008-05-21 Fix segfault in TkAgg backend - MGD
+
2008-05-21 Fix a "local variable unreferenced" bug in plotfile - MM
2008-05-19 Fix crash when Windows can not access the registry to
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_wx.py
===
--- trunk/matplotlib/lib/matplotlib/backends/backend_wx.py 2008-05-22
14:21:10 UTC (rev 5213)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_wx.py 2008-05-22
14:32:56 UTC (rev 5214)
@@ -1226,14 +1226,15 @@
pos =wx.Point(20,20)
l,b,w,h = fig.bbox.bounds
wx.Frame.__init__(self, parent=None, id=-1, pos=pos,
- title="Figure %d" % num,
- size=(w,h))
+ title="Figure %d" % num)
+# Frame will be sized later by the Fit method
DEBUG_MSG("__init__()", 1, self)
self.num = num
statbar = StatusBarWx(self)
self.SetStatusBar(statbar)
self.canvas = self.get_canvas(fig)
+self.canvas.SetInitialSize(wx.Size(fig.bbox.width(),
fig.bbox.height()))
self.sizer =wx.BoxSizer(wx.VERTICAL)
self.sizer.Add(self.canvas, 1, wx.TOP | wx.LEFT | wx.EXPAND)
# By adding toolbar in sizer, we are able to put it at the bottom
@@ -1352,6 +1353,11 @@
def set_window_title(self, title):
self.window.SetTitle(title)
+def resize(self, width, height)
+'Set the canvas size in pixels'
+self.canvas.SetInitialSize(wx.Size(width, height))
+self.window.GetSizer().Fit(self.window)
+
# Identifiers for toolbar controls - images_wx contains bitmaps for the images
# used in the controls. wxWindows does not provide any stock images, so I've
# 'stolen' those from GTK2, and transformed them into the appropriate format.
Modified: trunk/matplotlib/lib/matplotlib/figure.py
===
--- trunk/matplotlib/lib/matplotlib/figure.py 2008-05-22 14:21:10 UTC (rev
5213)
+++ trunk/matplotlib/lib/matplotlib/figure.py 2008-05-22 14:32:56 UTC (rev
5214)
@@ -414,6 +414,7 @@
from the shell
WARNING: forward=True is broken on all backends except GTK*
+and WX*
ACCEPTS: a w,h tuple with w,h in inches
"""
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/vse012070mrt/direct/01/
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib: [5215] branches/v0_91_maint/lib/matplotlib/backends /backend_wx.py
Revision: 5215 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5215&view=rev Author: jdh2358 Date: 2008-05-22 11:14:59 -0700 (Thu, 22 May 2008) Log Message: --- fixed a wx bug Modified Paths: -- branches/v0_91_maint/lib/matplotlib/backends/backend_wx.py Modified: branches/v0_91_maint/lib/matplotlib/backends/backend_wx.py === --- branches/v0_91_maint/lib/matplotlib/backends/backend_wx.py 2008-05-22 14:32:56 UTC (rev 5214) +++ branches/v0_91_maint/lib/matplotlib/backends/backend_wx.py 2008-05-22 18:14:59 UTC (rev 5215) @@ -1413,7 +1413,7 @@ def set_window_title(self, title): self.window.SetTitle(title) -def resize(self, width, height) +def resize(self, width, height): 'Set the canvas size in pixels' self.canvas.SetInitialSize(wx.Size(width, height)) self.window.GetSizer().Fit(self.window) 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/vse012070mrt/direct/01/ ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib: [5216] trunk/matplotlib
Revision: 5216 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5216&view=rev Author: jdh2358 Date: 2008-05-22 11:16:43 -0700 (Thu, 22 May 2008) Log Message: --- Merged revisions 5215 via svnmerge from https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_91_maint r5215 | jdh2358 | 2008-05-22 13:14:59 -0500 (Thu, 22 May 2008) | 1 line fixed a wx bug Modified Paths: -- trunk/matplotlib/lib/matplotlib/backends/backend_wx.py Property Changed: trunk/matplotlib/ Property changes on: trunk/matplotlib ___ Name: svnmerge-integrated - /branches/v0_91_maint:1-5213 + /branches/v0_91_maint:1-5215 Modified: trunk/matplotlib/lib/matplotlib/backends/backend_wx.py === --- trunk/matplotlib/lib/matplotlib/backends/backend_wx.py 2008-05-22 18:14:59 UTC (rev 5215) +++ trunk/matplotlib/lib/matplotlib/backends/backend_wx.py 2008-05-22 18:16:43 UTC (rev 5216) @@ -1353,7 +1353,7 @@ def set_window_title(self, title): self.window.SetTitle(title) -def resize(self, width, height) +def resize(self, width, height): 'Set the canvas size in pixels' self.canvas.SetInitialSize(wx.Size(width, height)) self.window.GetSizer().Fit(self.window) 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/vse012070mrt/direct/01/ ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib: [5218] trunk/matplotlib/lib/matplotlib
Revision: 5218 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5218&view=rev Author: dsdale Date: 2008-05-22 14:01:40 -0700 (Thu, 22 May 2008) Log Message: --- minor changes to docstring formatting to support ReST Modified Paths: -- trunk/matplotlib/lib/matplotlib/axes.py trunk/matplotlib/lib/matplotlib/dviread.py trunk/matplotlib/lib/matplotlib/texmanager.py Modified: trunk/matplotlib/lib/matplotlib/axes.py === --- trunk/matplotlib/lib/matplotlib/axes.py 2008-05-22 19:58:22 UTC (rev 5217) +++ trunk/matplotlib/lib/matplotlib/axes.py 2008-05-22 21:01:40 UTC (rev 5218) @@ -2722,9 +2722,7 @@ Basic plotting def plot(self, *args, **kwargs): """ -PLOT(*args, **kwargs) - -Plot lines and/or markers to the Axes. *args is a variable length +Plot lines and/or markers to the Axes. ``*args`` is a variable length argument, allowing for multiple x,y pairs with an optional format string. For example, each of the following is legal @@ -2744,32 +2742,32 @@ The following line styles are supported: -- : solid line ---: dashed line --.: dash-dot line -: : dotted line -. : points -, : pixels -o : circle symbols -^ : triangle up symbols -v : triangle down symbols -< : triangle left symbols -> : triangle right symbols -s : square symbols -+ : plus symbols -x : cross symbols -D : diamond symbols -d : thin diamond symbols -1 : tripod down symbols -2 : tripod up symbols -3 : tripod left symbols -4 : tripod right symbols -h : hexagon symbols -H : rotated hexagon symbols -p : pentagon symbols -| : vertical line symbols -_ : horizontal line symbols -steps : use gnuplot style 'steps' # kwarg only +* - : solid line +* --: dashed line +* -.: dash-dot line +* : : dotted line +* . : points +* , : pixels +* o : circle symbols +* ^ : triangle up symbols +* v : triangle down symbols +* < : triangle left symbols +* > : triangle right symbols +* s : square symbols +* + : plus symbols +* x : cross symbols +* D : diamond symbols +* d : thin diamond symbols +* 1 : tripod down symbols +* 2 : tripod up symbols +* 3 : tripod left symbols +* 4 : tripod right symbols +* h : hexagon symbols +* H : rotated hexagon symbols +* p : pentagon symbols +* | : vertical line symbols +* _ : horizontal line symbols +* steps : use gnuplot style 'steps' # kwarg only The following color abbreviations are supported @@ -2792,8 +2790,8 @@ Line styles and colors are combined in a single format string, as in 'bo' for blue circles. -The **kwargs can be used to set line properties (any property that has -a set_* method). You can use this to set a line label (for auto +The ``**kwargs`` can be used to set line properties (any property that has +a ``set_*`` method). You can use this to set a line label (for auto legends), linewidth, anitialising, marker face color, etc. Here is an example: Modified: trunk/matplotlib/lib/matplotlib/dviread.py === --- trunk/matplotlib/lib/matplotlib/dviread.py 2008-05-22 19:58:22 UTC (rev 5217) +++ trunk/matplotlib/lib/matplotlib/dviread.py 2008-05-22 21:01:40 UTC (rev 5218) @@ -3,17 +3,18 @@ limitations make this not (currently) useful as a general-purpose dvi preprocessor. -Interface: +Interface:: -dvi = Dvi(filename, 72) -for page in dvi: # iterate over pages -w, h, d = page.width, page.height, page.descent -for x,y,font,glyph,width in page.text: -fontname = font.texname -pointsize = font.size -... -for x,y,height,width in page.boxes: -... + dvi = Dvi(filename, 72) + for page in dvi: # iterate over pages + w, h, d = page.width, page.height, page.descent + for x,y,font,glyph,width in page.text: + fontname = font.texname + pointsize = font.size + ... + for x,y,height,width in page.boxes: + ... + """ import matplotlib @@ -419,12 +420,13 @@ class Vf(Dvi): """ -A virtual font (*.vf file) containing subroutin
SF.net SVN: matplotlib: [5219] trunk/matplotlib/CHANGELOG
Revision: 5219 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5219&view=rev Author: dsdale Date: 2008-05-22 14:02:08 -0700 (Thu, 22 May 2008) Log Message: --- forgot to commit the CHANGELOG Modified Paths: -- trunk/matplotlib/CHANGELOG Modified: trunk/matplotlib/CHANGELOG === --- trunk/matplotlib/CHANGELOG 2008-05-22 21:01:40 UTC (rev 5218) +++ trunk/matplotlib/CHANGELOG 2008-05-22 21:02:08 UTC (rev 5219) @@ -1,3 +1,10 @@ +2008-05-22 Added support for ReST-based doumentation using Sphinx. + Documents are located in doc/, and are broken up into + a users guide and an API reference. To build, run the + make.py files. Sphinx-0.4 is needed to build generate xml, + which will be useful for rendering equations with mathml, + use sphinx from svn until 0.4 is released - DSD + 2008-05-21 Fix segfault in TkAgg backend - MGD 2008-05-21 Fix a "local variable unreferenced" bug in plotfile - MM 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/vse012070mrt/direct/01/ ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib: [5220] trunk/matplotlib/doc/users_guide/source
Revision: 5220 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5220&view=rev Author: dsdale Date: 2008-05-22 14:49:25 -0700 (Thu, 22 May 2008) Log Message: --- added a section to the dev guide explaining how to get up and running with Sphinx Modified Paths: -- trunk/matplotlib/doc/users_guide/source/developerguide.txt Added Paths: --- trunk/matplotlib/doc/users_guide/source/documenting_mpl.txt Modified: trunk/matplotlib/doc/users_guide/source/developerguide.txt === --- trunk/matplotlib/doc/users_guide/source/developerguide.txt 2008-05-22 21:02:08 UTC (rev 5219) +++ trunk/matplotlib/doc/users_guide/source/developerguide.txt 2008-05-22 21:49:25 UTC (rev 5220) @@ -8,4 +8,5 @@ :maxdepth: 3 coding_guide + documenting_mpl add_new_projection Added: trunk/matplotlib/doc/users_guide/source/documenting_mpl.txt === --- trunk/matplotlib/doc/users_guide/source/documenting_mpl.txt (rev 0) +++ trunk/matplotlib/doc/users_guide/source/documenting_mpl.txt 2008-05-22 21:49:25 UTC (rev 5220) @@ -0,0 +1,43 @@ +** +Documenting Matplotlib +** + +The documentation for matplotlib is generated from ReStructured Text +using the Sphinx_ documentation generation tool. Sphinx-0.4 or later +is required to generate xml files to render mathematical expressions +with mathml. Currently this means we need to install from the svn +repository by doing:: + + svn co http://svn.python.org/projects/doctools/trunk sphinx + cd sphinx + python setup.py install + +.. _Sphinx: http://sphinx.pocoo.org/ + +The documentation sources are found in the doc/ directory in the trunk. +To build the users guid in html format, cd into doc/users_guide and do:: + + python make.py html + +you can also pass a ``latex`` flag to make.py to build a pdf, or pass no +arguments to build everything. The same procedure can be followed for +the sources in doc/api_reference. + +The actual ReStructured Text files are kept in doc/users_guide/source +and doc/api_reference/source. The main entry point is index.txt. +Additional files can be added by including their base file name +(dropping the .txt extension) in the table of contents. It is also +possible to include other documents through the use of an include +statement. For example, in the Developers Guide, index.txt lists +coding_guide, which automatically inserts coding_guide.txt. +coding_guide.txt is just a placeholder, it contains one line only to +gets its contents from the CODING_GUIDE file in the trunk: +``.. include:: ../../CODING_GUIDE``. + +The output produced by Sphinx can be configured by editing the conf.py +files located in the documentation source directories. + +The Sphinx website contains plenty of documentation_ concerning ReST +markup and working with Sphinx in general. + +.. _documentation: http://sphinx.pocoo.org/contents.html \ No newline at end of file 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/vse012070mrt/direct/01/ ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
