Commitcfdb753

committed

Fixups from review

1 parent20b894b commitcfdb753Copy full SHA for cfdb753

File tree

+11

-11

lines changed

+11

-11

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -982,7 +982,7 @@ def _set_alpha_for_array(self, alpha):`
`982`	`982`	`Artist.set_alpha(self,alpha)`
`983`	`983`	`return`
`984`	`984`	`alpha=np.asarray(alpha)`
`985`		`-ifnot (alpha.min()>=0andalpha.max()<=1):`
	`985`	`+ifnot (0<=alpha.min()andalpha.max()<=1):`
`986`	`986`	`raiseValueError('alpha must be between 0 and 1, inclusive, '`
`987`	`987`	`f'but min is{alpha.min()}, max is{alpha.max()}')`
`988`	`988`	`self._alpha=alpha`

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -837,9 +837,9 @@ def set_alpha(self, alpha):`
`837`	`837`
`838`	`838`	`Parameters`
`839`	`839`	`----------`
`840`		`- alpha: float or array of float`
	`840`	`+ alpha: float or array of float or None`
`841`	`841`	`If not None, alpha values must be between 0 and 1, inclusive.`
`842`		`- If an array is provided,it's length must match the number of`
	`842`	`+ If an array is provided,its length must match the number of`
`843`	`843`	`elements in the collection. Masked values and nans are not`
`844`	`844`	`supported.`
`845`	`845`	`"""`
`@@ -867,13 +867,13 @@ def update_scalarmappable(self):`
`867`	`867`	`return`
`868`	`868`	`ifnp.iterable(self._alpha):`
`869`	`869`	`ifself._alpha.size!=self._A.size:`
`870`		`-# This can occur with the deprecated behavior of 'flat'`
`871`		`-# pcolormesh shading. If we bring the current change in`
`872`		`-# before that deprecated behavior is removed, we need to`
`873`		`-# add the explanation to the message below.`
`874`	`870`	`raiseValueError(f'Data array shape,{self._A.shape} '`
`875`	`871`	`'is incompatible with alpha array shape, '`
`876`		`-f'{self._alpha.shape}.')`
	`872`	`+f'{self._alpha.shape}. '`
	`873`	`+'This can occur with the deprecated '`
	`874`	`+'behavior of the "flat" shading option, '`
	`875`	`+'in which a row and/or column of the data '`
	`876`	`+'array is dropped.')`
`877`	`877`	`# pcolormesh, scatter, maybe others flatten their _A`
`878`	`878`	`self._alpha=self._alpha.reshape(self._A.shape)`
`879`	`879`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -615,8 +615,8 @@ def __call__(self, X, alpha=None, bytes=False):`
`615`	`615`	`ifalphaisnotNone:`
`616`	`616`	`ifnp.iterable(alpha):`
`617`	`617`	`alpha=np.asarray(alpha)`
`618`		`-ifnot (alpha.shape==xa.shape):`
`619`		`-raiseValueError("alpha is array-like butit's shape"`
	`618`	`+ifalpha.shape!=xa.shape:`
	`619`	`+raiseValueError("alpha is array-like butits shape"`
`620`	`620`	`" %s doesn't match that of X %s"%`
`621`	`621`	`(alpha.shape,xa.shape))`
`622`	`622`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ def set_alpha(self, alpha):`
`274`	`274`
`275`	`275`	`Parameters`
`276`	`276`	`----------`
`277`		`- alpha : float or2-d array or None`
	`277`	`+ alpha : float or2D array-like or None`
`278`	`278`	`"""`
`279`	`279`	`martist.Artist._set_alpha_for_array(self,alpha)`
`280`	`280`	`ifnp.ndim(alpha)notin (0,2):`

Comments

(0)