Commit8972e82

authored

Merge pull request#871 from henklaak/fix_root_locus_ax

Fix root_locus() handling of ax parameter

2 parents346bc40 +d13f1ed commit8972e82Copy full SHA for 8972e82

File tree

-8

lines changed

-8

lines changed

Lines changed: 2 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ def root_locus(sys, kvect=None, xlim=None, ylim=None,`
`260`	`260`	`ifisdtime(sys,strict=True):`
`261`	`261`	`zgrid(ax=ax)`
`262`	`262`	`else:`
`263`		`-_sgrid_func(fig=figifsisotoolelseNone)`
	`263`	`+_sgrid_func(ax)`
`264`	`264`	`else:`
`265`	`265`	`ax.axhline(0.,linestyle=':',color='k',linewidth=.75,zorder=-20)`
`266`	`266`	`ax.axvline(0.,linestyle=':',color='k',linewidth=.75,zorder=-20)`
`@@ -660,13 +660,7 @@ def _removeLine(label, ax):`
`660`	`660`	`delline`
`661`	`661`
`662`	`662`
`663`		`-def_sgrid_func(fig=None,zeta=None,wn=None):`
`664`		`-iffigisNone:`
`665`		`-fig=plt.gcf()`
`666`		`-ax=fig.gca()`
`667`		`-else:`
`668`		`-ax=fig.axes[1]`
`669`		`-`
	`663`	`+def_sgrid_func(ax,zeta=None,wn=None):`
`670`	`664`	`# Get locator function for x-axis, y-axis tick marks`
`671`	`665`	`xlocator=ax.get_xaxis().get_major_locator()`
`672`	`666`	`ylocator=ax.get_yaxis().get_major_locator()`

Comments

(0)