Commit0636a04

authored

Merge pull request#21145 from anntzer/fcdn

Fix format_cursor_data with nans.

2 parents0592917 +09bc4f0 commit0636a04Copy full SHA for 0636a04

File tree

+13

-6

lines changed

+13

-6

lines changed

Lines changed: 12 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1274,11 +1274,18 @@ def format_cursor_data(self, data):`
`1274`	`1274`	`# Artist.format_cursor_data would always have precedence over`
`1275`	`1275`	`# ScalarMappable.format_cursor_data.`
`1276`	`1276`	`n=self.cmap.N`
`1277`		`-# Midpoints of neighboring color intervals.`
`1278`		`-neighbors=self.norm.inverse(`
`1279`		`- (int(self.norm(data)*n)+np.array([0,1]))/n)`
`1280`		`-delta=abs(neighbors-data).max()`
`1281`		`-return"[{:-#.{}g}]".format(data,cbook._g_sig_digits(data,delta))`
	`1277`	`+ifnp.ma.getmask(data):`
	`1278`	`+return"[]"`
	`1279`	`+normed=self.norm(data)`
	`1280`	`+ifnp.isfinite(normed):`
	`1281`	`+# Midpoints of neighboring color intervals.`
	`1282`	`+neighbors=self.norm.inverse(`
	`1283`	`+ (int(self.norm(data)*n)+np.array([0,1]))/n)`
	`1284`	`+delta=abs(neighbors-data).max()`
	`1285`	`+g_sig_digits=cbook._g_sig_digits(data,delta)`
	`1286`	`+else:`
	`1287`	`+g_sig_digits=3# Consistent with default below.`
	`1288`	`+return"[{:-#.{}g}]".format(data,g_sig_digits)`
`1282`	`1289`	`else:`
`1283`	`1290`	`try:`
`1284`	`1291`	`data[0]`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -340,6 +340,7 @@ def test_cursor_data():`
`340`	`340`	`"data, text", [`
`341`	`341`	`([[10001,10000]],"[10001.000]"),`
`342`	`342`	`([[.123,.987]],"[0.123]"),`
	`343`	`+ ([[np.nan,1,2]],"[]"),`
`343`	`344`	`])`
`344`	`345`	`deftest_format_cursor_data(data,text):`
`345`	`346`	`frommatplotlib.backend_basesimportMouseEvent`
`@@ -349,7 +350,6 @@ def test_format_cursor_data(data, text):`
`349`	`350`
`350`	`351`	`xdisp,ydisp=ax.transData.transform([0,0])`
`351`	`352`	`event=MouseEvent('motion_notify_event',fig.canvas,xdisp,ydisp)`
`352`		`-assertim.get_cursor_data(event)==data[0][0]`
`353`	`353`	`assertim.format_cursor_data(im.get_cursor_data(event))==text`
`354`	`354`
`355`	`355`

Comments

(0)