matplotlib-checkins Mailing List for matplotlib

Revision: 8306
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8306&view=rev
Author: mdboom
Date: 2010年05月10日 20:34:33 +0000 (2010年5月10日)
Log Message:
-----------
[2998906] OverflowError when xscale='log' for hexbin
Raises ValueError if trying to log-scale non-positive values.
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/axes.py
Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py	2010年05月10日 20:17:51 UTC (rev 8305)
+++ trunk/matplotlib/lib/matplotlib/axes.py	2010年05月10日 20:34:33 UTC (rev 8306)
@@ -5778,8 +5778,12 @@
 x = np.array(x, float)
 y = np.array(y, float)
 if xscale=='log':
+ if np.any(x <= 0.0):
+ raise ValueError("x contains non-positive values, so can not be log-scaled")
 x = np.log10(x)
 if yscale=='log':
+ if np.any(y <= 0.0):
+ raise ValueError("y contains non-positive values, so can not be log-scaled")
 y = np.log10(y)
 if extent is not None:
 xmin, xmax, ymin, ymax = extent
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8305
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8305&view=rev
Author: mdboom
Date: 2010年05月10日 20:17:51 +0000 (2010年5月10日)
Log Message:
-----------
Fix minus signs in Ps output.
Modified Paths:
--------------
 trunk/matplotlib/ttconv/pprdrv_tt.cpp
Modified: trunk/matplotlib/ttconv/pprdrv_tt.cpp
===================================================================
--- trunk/matplotlib/ttconv/pprdrv_tt.cpp	2010年05月10日 18:58:07 UTC (rev 8304)
+++ trunk/matplotlib/ttconv/pprdrv_tt.cpp	2010年05月10日 20:17:51 UTC (rev 8305)
@@ -420,7 +420,7 @@
 -------------------------------------------------------------*/
 void ttfont_encoding(TTStreamWriter& stream, struct TTFONT *font, std::vector<int>& glyph_ids, font_type_enum target_type)
 {
- stream.putline("/Encoding ISOLatin1Encoding def");
+ stream.putline("/Encoding StandardEncoding def");
 
 // if (target_type == PS_TYPE_3) {
 // stream.printf("/Encoding [ ");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8304
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8304&view=rev
Author: mdboom
Date: 2010年05月10日 18:58:07 +0000 (2010年5月10日)
Log Message:
-----------
Use a different strategy for the LogLocator for radial lines on polar plots.
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/ticker.py
Modified: trunk/matplotlib/lib/matplotlib/ticker.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/ticker.py	2010年05月10日 18:20:19 UTC (rev 8303)
+++ trunk/matplotlib/lib/matplotlib/ticker.py	2010年05月10日 18:58:07 UTC (rev 8304)
@@ -1196,13 +1196,14 @@
 Determine the tick locations for log axes
 """
 
- def __init__(self, base=10.0, subs=[1.0]):
+ def __init__(self, base=10.0, subs=[1.0], numdecs=4):
 """
 place ticks on the location= base**i*subs[j]
 """
 self.base(base)
 self.subs(subs)
 self.numticks = 15
+ self.numdecs = numdecs
 
 def base(self,base):
 """
@@ -1227,6 +1228,14 @@
 b=self._base
 
 vmin, vmax = self.axis.get_view_interval()
+
+ if self.axis.axes.name == 'polar':
+ vmax = math.ceil(math.log(vmax) / math.log(b))
+ decades = np.arange(vmax - self.numdecs, vmax)
+ ticklocs = b ** decades
+
+ return ticklocs
+
 if vmin <= 0.0:
 vmin = self.axis.get_minpos()
 if vmin <= 0.0:
@@ -1265,10 +1274,16 @@
 
 def view_limits(self, vmin, vmax):
 'Try to choose the view limits intelligently'
+ b = self._base
 
 if vmax<vmin:
 vmin, vmax = vmax, vmin
 
+ if self.axis.axes.name == 'polar':
+ vmax = math.ceil(math.log(vmax) / math.log(b))
+ vmin = b ** (vmax - self.numdecs)
+ return vmin, vmax
+
 minpos = self.axis.get_minpos()
 
 if minpos<=0:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8303
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8303&view=rev
Author: mdboom
Date: 2010年05月10日 18:20:19 +0000 (2010年5月10日)
Log Message:
-----------
Remove auto-bumping of radial tick labels on polar plots, since it breaks for log scaling.
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/projections/polar.py
Modified: trunk/matplotlib/lib/matplotlib/projections/polar.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/projections/polar.py	2010年05月10日 18:06:45 UTC (rev 8302)
+++ trunk/matplotlib/lib/matplotlib/projections/polar.py	2010年05月10日 18:20:19 UTC (rev 8303)
@@ -301,10 +301,6 @@
 self.viewLim.y0 = 0
 self.viewLim.y1 = rmax
 angle = self._r_label1_position.to_values()[4]
- self._r_label1_position.clear().translate(
- angle, rmax * self._rpad)
- self._r_label2_position.clear().translate(
- angle, -rmax * self._rpad)
 
 def get_rmax(self):
 return self.viewLim.ymax
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8302
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8302&view=rev
Author: mdboom
Date: 2010年05月10日 18:06:45 +0000 (2010年5月10日)
Log Message:
-----------
Fix aspect ratio calculation for polar plots.
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/axes.py
Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py	2010年05月09日 02:59:29 UTC (rev 8301)
+++ trunk/matplotlib/lib/matplotlib/axes.py	2010年05月10日 18:06:45 UTC (rev 8302)
@@ -1084,20 +1084,23 @@
 
 aspect = self.get_aspect()
 
- xscale, yscale = self.get_xscale(), self.get_yscale()
- if xscale == "linear" and yscale == "linear":
+ if self.name != 'polar':
+ xscale, yscale = self.get_xscale(), self.get_yscale()
+ if xscale == "linear" and yscale == "linear":
+ aspect_scale_mode = "linear"
+ elif xscale == "log" and yscale == "log":
+ aspect_scale_mode = "log"
+ elif (xscale == "linear" and yscale == "log") or \
+ (xscale == "log" and yscale == "linear"):
+ if aspect is not "auto":
+ warnings.warn(
+ 'aspect is not supported for Axes with xscale=%s, yscale=%s' \
+ % (xscale, yscale))
+ aspect = "auto"
+ else: # some custom projections have their own scales.
+ pass
+ else:
 aspect_scale_mode = "linear"
- elif xscale == "log" and yscale == "log":
- aspect_scale_mode = "log"
- elif (xscale == "linear" and yscale == "log") or \
- (xscale == "log" and yscale == "linear"):
- if aspect is not "auto":
- warnings.warn(
- 'aspect is not supported for Axes with xscale=%s, yscale=%s' \
- % (xscale, yscale))
- aspect = "auto"
- else: # some custom projections have their own scales.
- pass
 
 if aspect == 'auto':
 self.set_position( position , which='active')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.