SF.net SVN: matplotlib:[8554] branches/v1_0_maint/lib/matplotlib/axis.py
Revision: 8554 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8554&view=rev Author: efiring Date: 2010-07-15 17:34:42 + (Thu, 15 Jul 2010) Log Message: --- yaxis.set_ticks_position: fix bug with 'none'; thanks to Ben North Modified Paths: -- branches/v1_0_maint/lib/matplotlib/axis.py Modified: branches/v1_0_maint/lib/matplotlib/axis.py === --- branches/v1_0_maint/lib/matplotlib/axis.py 2010-07-15 03:53:14 UTC (rev 8553) +++ branches/v1_0_maint/lib/matplotlib/axis.py 2010-07-15 17:34:42 UTC (rev 8554) @@ -1886,11 +1886,12 @@ def set_ticks_position(self, position): """ -Set the ticks position (left, right, both or default) -both sets the ticks to appear on both positions, but -does not change the tick labels. -default resets the tick positions to the default: -ticks on both positions, labels on the left. +Set the ticks position (left, right, both, default or none) +'both' sets the ticks to appear on both positions, but does not +change the tick labels. 'default' resets the tick positions to +the default: ticks on both positions, labels at left. 'none' +can be used if you don't want any ticks. 'none' and 'both' +affect only the ticks, not the labels. ACCEPTS: [ 'left' | 'right' | 'both' | 'default' | 'none' ] """ @@ -1904,8 +1905,8 @@ self.set_tick_params(which='both', right=True, left=True) elif position == 'none': -self.set_tick_params(which='both', right=False, labelright=False, - left=False, labelleft=False) +self.set_tick_params(which='both', right=False, + left=False) elif position == 'default': self.set_tick_params(which='both', right=True, labelright=False, left=True, labelleft=True) 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 Sprint What will you do first with EVO, the first 4G phone? Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib:[8555] trunk/matplotlib
Revision: 8555 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8555&view=rev Author: efiring Date: 2010-07-15 17:37:19 + (Thu, 15 Jul 2010) Log Message: --- Merged revisions 8554 via svnmerge from https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint r8554 | efiring | 2010-07-15 07:34:42 -1000 (Thu, 15 Jul 2010) | 2 lines yaxis.set_ticks_position: fix bug with 'none'; thanks to Ben North Modified Paths: -- trunk/matplotlib/lib/matplotlib/axis.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/examples/misc/multiprocess.py trunk/matplotlib/examples/mplot3d/contour3d_demo.py trunk/matplotlib/examples/mplot3d/contourf3d_demo.py trunk/matplotlib/examples/mplot3d/polys3d_demo.py trunk/matplotlib/examples/mplot3d/scatter3d_demo.py trunk/matplotlib/examples/mplot3d/surface3d_demo.py trunk/matplotlib/examples/mplot3d/wire3d_demo.py trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png Property changes on: trunk/matplotlib ___ Modified: svnmerge-integrated - /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8549 /trunk/matplotlib:1-7315 + /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8554 /trunk/matplotlib:1-7315 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,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint:8521,8524-8541,8543,8549 + /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,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint:8521,8524-8541,8543,8549,8554 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,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/doc/pyplots/README:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/doc/pyplots/README:8521,8524-8541,8543,8549 + /branches/v0_9
SF.net SVN: matplotlib:[8556] branches/py3k
Revision: 8556
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8556&view=rev
Author: mdboom
Date: 2010-07-15 18:34:54 + (Thu, 15 Jul 2010)
Log Message:
---
Fix compilation in Python 2.x
Modified Paths:
--
branches/py3k/setupext.py
branches/py3k/src/_backend_agg.cpp
branches/py3k/src/_path.cpp
Modified: branches/py3k/setupext.py
===
--- branches/py3k/setupext.py 2010-07-15 17:37:19 UTC (rev 8555)
+++ branches/py3k/setupext.py 2010-07-15 18:34:54 UTC (rev 8556)
@@ -136,9 +136,11 @@
defines = [
('PY_ARRAY_UNIQUE_SYMBOL', 'MPL_ARRAY_API'),
-('PYCXX_ISO_CPP_LIB', '1'),
-('PYCXX_PYTHON_2TO3', '1')]
+('PYCXX_ISO_CPP_LIB', '1')]
+if sys.hexversion >= 0x0300:
+defines.append(('PYCXX_PYTHON_2TO3', '1'))
+
# Based on the contents of setup.cfg, determine the build options
if os.path.exists("setup.cfg"):
config = configparser.SafeConfigParser()
Modified: branches/py3k/src/_backend_agg.cpp
===
--- branches/py3k/src/_backend_agg.cpp 2010-07-15 17:37:19 UTC (rev 8555)
+++ branches/py3k/src/_backend_agg.cpp 2010-07-15 18:34:54 UTC (rev 8556)
@@ -213,7 +213,7 @@
GCAgg::_set_antialiased(const Py::Object& gc)
{
_VERBOSE("GCAgg::antialiased");
-isaa = gc.getAttr("_antialiased").as_bool();
+isaa = Py::Boolean(gc.getAttr("_antialiased"));
}
@@ -1518,7 +1518,7 @@
if (check_snap)
{
-gc.isaa = antialiaseds[i % Naa].as_bool();
+gc.isaa = Py::Boolean(antialiaseds[i % Naa]);
transformed_path_t tpath(path, trans);
nan_removed_t nan_removed(tpath, true, has_curves);
@@ -1537,7 +1537,7 @@
}
else
{
-gc.isaa = antialiaseds[i % Naa].as_bool();
+gc.isaa = Py::Boolean(antialiaseds[i % Naa]);
transformed_path_t tpath(path, trans);
nan_removed_t nan_removed(tpath, true, has_curves);
@@ -1750,8 +1750,8 @@
Py::Object offsets_obj = args[5];
agg::trans_affine offset_trans =
py_to_agg_transformation_matrix(args[6].ptr());
Py::Object facecolors_obj = args[7];
-boolantialiased = args[8].as_bool();
-boolshowedges= args[9].as_bool();
+boolantialiased = Py::Boolean(args[8]);
+boolshowedges= Py::Boolean(args[9]);
boolfree_edgecolors = false;
QuadMeshGenerator path_generator(mesh_width, mesh_height,
coordinates.ptr());
Modified: branches/py3k/src/_path.cpp
===
--- branches/py3k/src/_path.cpp 2010-07-15 17:37:19 UTC (rev 8555)
+++ branches/py3k/src/_path.cpp 2010-07-15 18:34:54 UTC (rev 8556)
@@ -379,7 +379,7 @@
"Must pass Bbox object as arg 3 of update_path_extents");
}
Py::Object minpos_obj = args[3];
-bool ignore = args[4].as_bool();
+bool ignore = Py::Boolean(args[4]);
double xm, ym;
PyArrayObject* input_minpos = NULL;
@@ -599,7 +599,7 @@
Py::SeqBase transforms_obj = args[5];
Py::SeqBase offsets_obj = args[6];
agg::trans_affine offset_trans =
py_to_agg_transformation_matrix(args[7].ptr());
-boolfilled = args[8].as_bool();
+boolfilled = Py::Boolean(args[8]);
PyArrayObject* offsets = (PyArrayObject*)PyArray_FromObject(
offsets_obj.ptr(), PyArray_DOUBLE, 0, 2);
@@ -926,7 +926,7 @@
PathIterator path(args[0]);
Py::Object bbox_obj = args[1];
-bool inside = args[2].as_bool();
+bool inside = Py::Boolean(args[2]);
double x0, y0, x1, y1;
if (!py_convert_bbox(bbox_obj.ptr(), x0, y0, x1, y1))
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 Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib:[8557] branches/v1_0_maint/lib/matplotlib/backends/ backend_tkagg.py
Revision: 8557 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8557&view=rev Author: efiring Date: 2010-07-15 20:45:19 + (Thu, 15 Jul 2010) Log Message: --- show for tkagg doesn't block in script called via ipython -pylab. This is the first in an expected series of changes to show(). Modified Paths: -- branches/v1_0_maint/lib/matplotlib/backends/backend_tkagg.py Modified: branches/v1_0_maint/lib/matplotlib/backends/backend_tkagg.py === --- branches/v1_0_maint/lib/matplotlib/backends/backend_tkagg.py 2010-07-15 18:34:54 UTC (rev 8556) +++ branches/v1_0_maint/lib/matplotlib/backends/backend_tkagg.py 2010-07-15 20:45:19 UTC (rev 8557) @@ -71,7 +71,13 @@ """ for manager in Gcf.get_all_fig_managers(): manager.show() -Tk.mainloop() +try: +if not show._needmain: # might have been added by ipython +return +except AttributeError: +pass +if not matplotlib.is_interactive(): +Tk.mainloop() def new_figure_manager(num, *args, **kwargs): """ 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 Sprint What will you do first with EVO, the first 4G phone? Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib:[8558] trunk/matplotlib
Revision: 8558 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8558&view=rev Author: efiring Date: 2010-07-15 20:47:28 + (Thu, 15 Jul 2010) Log Message: --- Merged revisions 8557 via svnmerge from https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint r8557 | efiring | 2010-07-15 10:45:19 -1000 (Thu, 15 Jul 2010) | 3 lines show for tkagg doesn't block in script called via ipython -pylab. This is the first in an expected series of changes to show(). Modified Paths: -- trunk/matplotlib/lib/matplotlib/backends/backend_tkagg.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/examples/misc/multiprocess.py trunk/matplotlib/examples/mplot3d/contour3d_demo.py trunk/matplotlib/examples/mplot3d/contourf3d_demo.py trunk/matplotlib/examples/mplot3d/polys3d_demo.py trunk/matplotlib/examples/mplot3d/scatter3d_demo.py trunk/matplotlib/examples/mplot3d/surface3d_demo.py trunk/matplotlib/examples/mplot3d/wire3d_demo.py trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png Property changes on: trunk/matplotlib ___ Modified: svnmerge-integrated - /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8554 /trunk/matplotlib:1-7315 + /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8557 /trunk/matplotlib:1-7315 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,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint:8521,8524-8541,8543,8549,8554 + /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,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557 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,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/doc/pyplots/README:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121
