date:20090223

SF.net SVN: matplotlib:[6925] branches/v0_98_5_maint/doc/sphinxext/ inheritance_diagram.py

2009-02-23 Thread mdboom

Revision: 6925
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6925&view=rev
Author:   mdboom
Date: 2009-02-23 14:58:08 + (Mon, 23 Feb 2009)

Log Message:
---
Applied Fernando Perez's fix for LaTeX output.

Modified Paths:
--
branches/v0_98_5_maint/doc/sphinxext/inheritance_diagram.py

Modified: branches/v0_98_5_maint/doc/sphinxext/inheritance_diagram.py
===
--- branches/v0_98_5_maint/doc/sphinxext/inheritance_diagram.py 2009-02-21 
20:14:08 UTC (rev 6924)
+++ branches/v0_98_5_maint/doc/sphinxext/inheritance_diagram.py 2009-02-23 
14:58:08 UTC (rev 6925)
@@ -352,7 +352,7 @@
 
 graph.run_dot(['-Tpdf', '-o%s' % pdf_path],
   name, parts, graph_options={'size': '"6.0,6.0"'})
-return '\\includegraphics{%s}' % pdf_path
+return '\n\\includegraphics{%s}\n\n' % pdf_path
 
 def visit_inheritance_diagram(inner_func):
 """


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

--
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

SF.net SVN: matplotlib:[6926] trunk/matplotlib

2009-02-23 Thread mdboom

Revision: 6926
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6926&view=rev
Author:   mdboom
Date: 2009-02-23 15:00:29 + (Mon, 23 Feb 2009)

Log Message:
---
Merged revisions 6920,6925 via svnmerge from 
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_98_5_maint


  r6920 | mmetz_bn | 2009-02-18 09:44:08 -0500 (Wed, 18 Feb 2009) | 1 line
  
  Added scatter_hist example

  r6925 | mdboom | 2009-02-23 09:58:08 -0500 (Mon, 23 Feb 2009) | 2 lines
  
  Applied Fernando Perez's fix for LaTeX output.


Modified Paths:
--
trunk/matplotlib/doc/sphinxext/inheritance_diagram.py

Property Changed:

trunk/matplotlib/
trunk/matplotlib/doc/pyplots/README
trunk/matplotlib/doc/sphinxext/gen_gallery.py
trunk/matplotlib/doc/sphinxext/gen_rst.py
trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py


Property changes on: trunk/matplotlib
___
Modified: svnmerge-integrated
   - /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6918
   + /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6925
Modified: svn:mergeinfo
   - /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918
   + /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925


Property changes on: trunk/matplotlib/doc/pyplots/README
___
Modified: svn:mergeinfo
   - 
/branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918
   + 
/branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925


Property changes on: trunk/matplotlib/doc/sphinxext/gen_gallery.py
___
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918
   + /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925


Property changes on: trunk/matplotlib/doc/sphinxext/gen_rst.py
___
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918
   + /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925

Modified: trunk/matplotlib/doc/sphinxext/inheritance_diagram.py
===
--- trunk/matplotlib/doc/sphinxext/inheritance_diagram.py   2009-02-23 
14:58:08 UTC (rev 6925)
+++ trunk/matplotlib/doc/sphinxext/inheritance_diagram.py   2009-02-23 
15:00:29 UTC (rev 6926)
@@ -370,7 +370,7 @@
 
 graph.run_dot(['-Tpdf', '-o%s' % pdf_path],
   name, parts, graph_options={'size': '"6.0,6.0"'})
-return '\\includegraphics{%s}' % pdf_path
+return '\n\\includegraphics{%s}\n\n' % pdf_path
 
 def visit_inheritance_diagram(inner_func):
 """


Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
___
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771
   + /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925

SF.net SVN: matplotlib:[6927] branches/v0_98_5_maint/src/ agg_py_path_iterator.h

2009-02-23 Thread mdboom

Revision: 6927
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6927&view=rev
Author:   mdboom
Date: 2009-02-23 17:30:07 + (Mon, 23 Feb 2009)

Log Message:
---
Add credit to Allen Haldane in comments.

Modified Paths:
--
branches/v0_98_5_maint/src/agg_py_path_iterator.h

Modified: branches/v0_98_5_maint/src/agg_py_path_iterator.h
===
--- branches/v0_98_5_maint/src/agg_py_path_iterator.h   2009-02-23 15:00:29 UTC 
(rev 6926)
+++ branches/v0_98_5_maint/src/agg_py_path_iterator.h   2009-02-23 17:30:07 UTC 
(rev 6927)
@@ -264,7 +264,7 @@
 //are close to parallel, I calculate the distance moved perpendicular 
to the
 //last line. Once it gets too big, the lines cannot be combined.
 
-// This code was originally written by someone else (John Hunter?) and 
I
+// This code was originally written by Allen Haldane and I
 // have modified to work in-place -- meaning not creating an entirely
 // new path list each time.  In order to do that without too much
 // additional code complexity, it keeps a small queue around so that


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

--
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

SF.net SVN: matplotlib:[6928] branches/v0_98_5_maint

2009-02-23 Thread mdboom

Revision: 6928
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6928&view=rev
Author:   mdboom
Date: 2009-02-23 17:38:35 + (Mon, 23 Feb 2009)

Log Message:
---
C++ standards compliance for use with Sun C++ compiler.  These should be 
equivalent to what was there before on gcc.

Modified Paths:
--
branches/v0_98_5_maint/CXX/Extensions.hxx
branches/v0_98_5_maint/agg24/include/agg_alpha_mask_u8.h

Modified: branches/v0_98_5_maint/CXX/Extensions.hxx
===
--- branches/v0_98_5_maint/CXX/Extensions.hxx   2009-02-23 17:30:07 UTC (rev 
6927)
+++ branches/v0_98_5_maint/CXX/Extensions.hxx   2009-02-23 17:38:35 UTC (rev 
6928)
@@ -61,7 +61,7 @@
 namespace Py
 {
 class ExtensionModuleBase;
-
+
 // Make an Exception Type for use in raising custom exceptions
 class ExtensionExceptionType : public Object
 {
@@ -74,44 +74,44 @@
 void init(  ExtensionModuleBase &module, const std::string& name );
 };
 
-
-class MethodTable 
+
+class MethodTable
 {
 public:
 MethodTable();
 virtual ~MethodTable();
-
+
 void add(const char* method_name, PyCFunction f, const char* doc="", 
int flag=1);
 PyMethodDef* table();
-
+
 protected:
 std::vector t;// accumulator of PyMethodDef's
 PyMethodDef *mt;// Actual method table produced when full
-
+
 static PyMethodDef method (const char* method_name, PyCFunction f, int 
flags = 1, const char* doc="");
-
+
 private:
 //
 // prevent the compiler generating these unwanted functions
 //
 MethodTable(const MethodTable& m);//unimplemented
 void operator=(const MethodTable& m);//unimplemented
-
+
 }; // end class MethodTable
-
+
 extern "C"
 {
 typedef PyObject *(*method_varargs_call_handler_t)( PyObject *_self, 
PyObject *_args );
 typedef PyObject *(*method_keyword_call_handler_t)( PyObject *_self, 
PyObject *_args, PyObject *_dict );
-};
-
+}
+
 template
 class MethodDefExt : public PyMethodDef
 {
 public:
 typedef Object (T::*method_varargs_function_t)( const Tuple &args );
 typedef Object (T::*method_keyword_function_t)( const Tuple &args, 
const Dict &kws );
-
+
 MethodDefExt
 (
 const char *_name,
@@ -124,11 +124,11 @@
 ext_meth_def.ml_meth = _handler;
 ext_meth_def.ml_flags = METH_VARARGS;
 ext_meth_def.ml_doc = const_cast(_doc);
-
+
 ext_varargs_function = _function;
 ext_keyword_function = NULL;
 }
-
+
 MethodDefExt
 (
 const char *_name,
@@ -141,57 +141,57 @@
 ext_meth_def.ml_meth = method_varargs_call_handler_t( _handler );
 ext_meth_def.ml_flags = METH_VARARGS|METH_KEYWORDS;
 ext_meth_def.ml_doc = const_cast(_doc);
-
+
 ext_varargs_function = NULL;
 ext_keyword_function = _function;
 }
-
+
 ~MethodDefExt()
 {}
-
+
 PyMethodDef ext_meth_def;
-method_varargs_function_t ext_varargs_function;
-method_keyword_function_t ext_keyword_function;
+method_varargs_function_t ext_varargs_function;
+method_keyword_function_t ext_keyword_function;
 };
-
+
 class ExtensionModuleBase
 {
 public:
 ExtensionModuleBase( const char *name );
 virtual ~ExtensionModuleBase();
-
+
 Module module(void) const;// only valid after initialize() has 
been called
 Dict moduleDictionary(void) const;// only valid after initialize() 
has been called
-
+
 virtual Object invoke_method_keyword( const std::string &_name, const 
Tuple &_args, const Dict &_keywords ) = 0;
 virtual Object invoke_method_varargs( const std::string &_name, const 
Tuple &_args ) = 0;
-
+
 const std::string &name() const;
 const std::string &fullName() const;
-
+
 protected:
 // Initialize the module
 void initialize( const char *module_doc );
-
+
 const std::string module_name;
 const std::string full_module_name;
 MethodTable method_table;
-
+
 private:
-
+
 //
 // prevent the compiler generating these unwanted functions
 //
 ExtensionModuleBase( const ExtensionModuleBase & );//unimplemented
 void operator=( const ExtensionModuleBase & );//unimplemented
-
+
 };
-
+
 extern "C" PyObject *method_keyword_call_handler( PyObject 
*_self_and_name_tuple, PyObject *_args, PyObject *_keywords );
 extern "C" PyObject *method_varargs_call_handler( PyObject 
*_self_and_name_tuple, PyObject *_args

SF.net SVN: matplotlib:[6929] trunk/matplotlib

2009-02-23 Thread mdboom

Revision: 6929
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6929&view=rev
Author:   mdboom
Date: 2009-02-23 17:43:26 + (Mon, 23 Feb 2009)

Log Message:
---
Merged revisions 6927-6928 via svnmerge from 
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_98_5_maint


  r6927 | mdboom | 2009-02-23 12:30:07 -0500 (Mon, 23 Feb 2009) | 2 lines
  
  Add credit to Allen Haldane in comments.

  r6928 | mdboom | 2009-02-23 12:38:35 -0500 (Mon, 23 Feb 2009) | 2 lines
  
  C++ standards compliance for use with Sun C++ compiler.  These should be 
equivalent to what was there before on gcc.


Modified Paths:
--
trunk/matplotlib/CXX/Extensions.hxx
trunk/matplotlib/agg24/include/agg_alpha_mask_u8.h
trunk/matplotlib/src/path_converters.h

Property Changed:

trunk/matplotlib/
trunk/matplotlib/doc/pyplots/README
trunk/matplotlib/doc/sphinxext/gen_gallery.py
trunk/matplotlib/doc/sphinxext/gen_rst.py


Property changes on: trunk/matplotlib
___
Modified: svnmerge-integrated
   - /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6925
   + /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6928
Modified: svn:mergeinfo
   - /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925
   + /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928

Modified: trunk/matplotlib/CXX/Extensions.hxx
===
--- trunk/matplotlib/CXX/Extensions.hxx 2009-02-23 17:38:35 UTC (rev 6928)
+++ trunk/matplotlib/CXX/Extensions.hxx 2009-02-23 17:43:26 UTC (rev 6929)
@@ -203,7 +203,7 @@
 {
 typedef PyObject *(*method_varargs_call_handler_t)( PyObject *_self, 
PyObject *_args );
 typedef PyObject *(*method_keyword_call_handler_t)( PyObject *_self, 
PyObject *_args, PyObject *_dict );
-};
+}
 
 template
 class MethodDefExt : public PyMethodDef

Modified: trunk/matplotlib/agg24/include/agg_alpha_mask_u8.h
===
--- trunk/matplotlib/agg24/include/agg_alpha_mask_u8.h  2009-02-23 17:38:35 UTC 
(rev 6928)
+++ trunk/matplotlib/agg24/include/agg_alpha_mask_u8.h  2009-02-23 17:43:26 UTC 
(rev 6929)
@@ -2,8 +2,8 @@
 // Anti-Grain Geometry - Version 2.4
 // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
 //
-// Permission to copy, use, modify, sell and distribute this software 
-// is granted provided this copyright notice appears in all copies. 
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all copies.
 // This software is provided "as is" without express or implied
 // warranty, and with no claim as to its suitability for any purpose.
 //
@@ -30,15 +30,15 @@
 {
 static unsigned calculate(const int8u* p) { return *p; }
 };
-
 
+
 //=rgb_to_gray_mask_u8
 template
 struct rgb_to_gray_mask_u8
 {
-static unsigned calculate(const int8u* p) 
-{ 
-return (p[R]*77 + p[G]*150 + p[B]*29) >> 8; 
+static unsigned calculate(const int8u* p)
+{
+return (p[R]*77 + p[G]*150 + p[B]*29) >> 8;
 }
 };
 
@@ -50,7 +50,7 @@
 typedef int8u cover_type;
 typedef alpha_mask_u8 self_type;
 enum cover_scale_e
-{ 
+{
 cover_shift = 8,
 cover_none  = 0,
 cover_full  = 255
@@ -64,12 +64,12 @@
 MaskF& mask_function() { return m_mask_function; }
 const MaskF& mask_function() const { return m_mask_function; }
 
-
+
 //
 cover_type pixel(int x, int y) const
 {
-if(x >= 0 && y >= 0 && 
-   x < (int)m_rbuf->width() && 
+if(x >= 0 && y >= 0 &&
+   x < (int)m_rbuf->width() &&
y < (int)m_rbuf->height())
 {
 return (cover_type)m_mask_function.calculate(
@@ -81,13 +81,13 @@
 //
 cover_type combine_pixel(int x, int y, cover_type val) const
 {
-if(x >= 0 && y >= 0 && 
-   x < (int)m_rbuf->width() && 
+if(x

SF.net SVN: matplotlib:[6925] branches/v0_98_5_maint/doc/sphinxext/ inheritance_diagram.py

SF.net SVN: matplotlib:[6926] trunk/matplotlib

SF.net SVN: matplotlib:[6927] branches/v0_98_5_maint/src/ agg_py_path_iterator.h

SF.net SVN: matplotlib:[6928] branches/v0_98_5_maint

SF.net SVN: matplotlib:[6929] trunk/matplotlib

5 matches

Site Navigation

Mail list logo

Footer information