Commit78dda48

committed

Apply un_convert to ginput(), get_xlim(), set_xlim()

1 parent185e95b commit78dda48Copy full SHA for 78dda48

File tree

+32

-4

lines changed

+32

-4

lines changed

Lines changed: 11 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3041,7 +3041,16 @@ def get_xlim(self):`
`3041`	`3041`	be greater than the `right` value.
`3042`	`3042`
`3043`	`3043`	`"""`
`3044`		`-returntuple(self.viewLim.intervalx)`
	`3044`	`+returnself._convert_back_lim(self.viewLim.intervalx,self.xaxis)`
	`3045`	`+`
	`3046`	`+def_convert_back_lim(self,lim,axis):`
	`3047`	`+"""`
	`3048`	`+ Helper method to convert axis limits back to unitized data.`
	`3049`	`+ """`
	`3050`	`+ifaxis.converterisnotNone:`
	`3051`	`+lim= [axis.converter.un_convert(l,axis.units,axis)for`
	`3052`	`+linlim]`
	`3053`	`+returntuple(lim)`
`3045`	`3054`
`3046`	`3055`	`def_validate_converted_limits(self,limit,convert):`
`3047`	`3056`	`"""`
`@@ -3393,6 +3402,7 @@ def get_ylim(self):`
`3393`	`3402`	will be greater than the `top` value.
`3394`	`3403`
`3395`	`3404`	`"""`
	`3405`	`+returnself._convert_back_lim(self.viewLim.intervaly,self.yaxis)`
`3396`	`3406`	`returntuple(self.viewLim.intervaly)`
`3397`	`3407`
`3398`	`3408`	`defset_ylim(self,bottom=None,top=None,emit=True,auto=False,`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1537,6 +1537,11 @@ def convert_units(self, x):`
`1537`	`1537`	`ret=self.converter.convert(x,self.units,self)`
`1538`	`1538`	`returnret`
`1539`	`1539`
	`1540`	`+defunconvert_units(self,x):`
	`1541`	`+ifself.converterisNone:`
	`1542`	`+returnx`
	`1543`	`+returnself.converter.un_convert(x,self.units,self)`
	`1544`	`+`
`1540`	`1545`	`defset_units(self,u):`
`1541`	`1546`	`"""`
`1542`	`1547`	`Set the units for axis.`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -180,12 +180,14 @@ def mouse_event_pop(self, event):`
`180`	`180`
`181`	`181`	`defadd_click(self,event):`
`182`	`182`	`"""Add the coordinates of an event to the list of clicks."""`
`183`		`-self.clicks.append((event.xdata,event.ydata))`
	`183`	`+x=event.inaxes.xaxis.unconvert_units(event.xdata)`
	`184`	`+y=event.inaxes.yaxis.unconvert_units(event.ydata)`
	`185`	`+self.clicks.append((x,y))`
`184`	`186`	`_log.info("input %i: %f, %f",`
`185`		`-len(self.clicks),event.xdata,event.ydata)`
	`187`	`+len(self.clicks),x,y)`
`186`	`188`	`# If desired, plot up click.`
`187`	`189`	`ifself.show_clicks:`
`188`		`-line=mlines.Line2D([event.xdata], [event.ydata],`
	`190`	`+line=mlines.Line2D([x], [y],`
`189`	`191`	`marker='+',color='r')`
`190`	`192`	`event.inaxes.add_line(line)`
`191`	`193`	`self.marks.append(line)`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -5815,3 +5815,14 @@ class DummySubplot(matplotlib.axes.SubplotBase, Dummy):`
`5815`	`5815`	`FactoryDummySubplot=matplotlib.axes.subplot_class_factory(Dummy)`
`5816`	`5816`
`5817`	`5817`	`assertDummySubplotisFactoryDummySubplot`
	`5818`	`+`
	`5819`	`+`
	`5820`	`+deftest_lim_units():`
	`5821`	`+# Check that get_(x,y)lim() returns unitized data`
	`5822`	`+fig,ax=plt.subplots()`
	`5823`	`+ax.scatter([datetime.datetime(2000,1,1)],`
	`5824`	`+ [datetime.datetime(2000,1,1)])`
	`5825`	`+xlim=ax.get_xlim()`
	`5826`	`+ylim=ax.get_ylim()`
	`5827`	`+forlinxlim+ylim:`
	`5828`	`+asserttype(l)isdatetime.datetime`

Comments

(0)