From: <par...@us...> - 2012-09-14 19:23:09
|
Revision: 11021 http://octave.svn.sourceforge.net/octave/?rev=11021&view=rev Author: paramaniac Date: 2012-09-14 19:23:03 +0000 (Fri, 14 Sep 2012) Log Message: ----------- control: finish sigma (almost) Modified Paths: -------------- trunk/octave-forge/main/control/NEWS trunk/octave-forge/main/control/inst/sigma.m Modified: trunk/octave-forge/main/control/NEWS =================================================================== --- trunk/octave-forge/main/control/NEWS 2012-09-14 18:54:35 UTC (rev 11020) +++ trunk/octave-forge/main/control/NEWS 2012-09-14 19:23:03 UTC (rev 11021) @@ -4,6 +4,11 @@ control-2.3.54 Release Date: 2012-xx-yy Release Manager: Lukas Reichlin =============================================================================== +** Multiplot feature for frequency-domain plotting: + + bode nichols pzmap + bodemag nyquist sigma + ** plot A selection of experiments from iddata identification datasets can be plotted by plot (dat, exp) instead of plot (dat(:,:,:,exp)). Modified: trunk/octave-forge/main/control/inst/sigma.m =================================================================== --- trunk/octave-forge/main/control/inst/sigma.m 2012-09-14 18:54:35 UTC (rev 11020) +++ trunk/octave-forge/main/control/inst/sigma.m 2012-09-14 19:23:03 UTC (rev 11021) @@ -86,18 +86,28 @@ len = numel (H); plot_args = {}; legend_args = cell (len, 1); + colororder = get (gca, "colororder"); + rc = rows (colororder); for k = 1:len + col = colororder(1+rem (k-1, rc), :); if (k == len) lim = nargin; else lim = sys_idx(k+1); endif style = varargin(style_idx(style_idx > sys_idx(k) & style_idx <= lim)); - plot_args = cat (2, plot_args, w(k), sv_db(k), style); + if (isempty (style)) + plot_args = cat (2, plot_args, w(k), sv_db(k), {"-", "color", col}); + else + plot_args = cat (2, plot_args, w(k), sv_db(k), style); + endif legend_args{k} = inputname(sys_idx(k)); # watch out for sigma (lticell{:}) endfor + ## FIXME: legend color is mostly blue if the first system is MIMO + ## maybe we can plot each line of sv individually + ## plot results semilogx (plot_args{:}) axis ("tight") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |