[Octave-cvsupdate] SF.net SVN: octave:[11026] trunk/octave-forge/main/control/inst

[<par...@us...>]

Revision: 11026
          http://octave.svn.sourceforge.net/octave/?rev=11026&view=rev
Author:   paramaniac
Date:     2012-09-15 11:15:50 +0000 (Sat, 15 Sep 2012)
Log Message:
-----------
control: solve possible problem with inputname

Modified Paths:
--------------
    trunk/octave-forge/main/control/inst/bode.m
    trunk/octave-forge/main/control/inst/bodemag.m
    trunk/octave-forge/main/control/inst/nichols.m
    trunk/octave-forge/main/control/inst/nyquist.m
    trunk/octave-forge/main/control/inst/pzmap.m
    trunk/octave-forge/main/control/inst/sigma.m

Modified: trunk/octave-forge/main/control/inst/bode.m
===================================================================
--- trunk/octave-forge/main/control/inst/bode.m	2012-09-15 07:07:18 UTC (rev 11025)
+++ trunk/octave-forge/main/control/inst/bode.m	2012-09-15 11:15:50 UTC (rev 11026)
@@ -77,7 +77,7 @@
     len = numel (H);  
     mag_args = {};
     pha_args = {};
-    legend_args = cell (len, 1);
+    legend_args = {};
 
     for k = 1:len
       if (k == len)
@@ -88,7 +88,9 @@
       style = varargin(style_idx(style_idx > sys_idx(k) & style_idx <= lim));
       mag_args = cat (2, mag_args, w(k), mag_db(k), style);
       pha_args = cat (2, pha_args, w(k), pha(k), style);
-      legend_args{k} = inputname(sys_idx(k));  # watch out for bode (lticell{:})
+      try
+        legend_args = cat (2, legend_args, inputname(sys_idx(k)));  # watch out for bode (lticell{:})
+      end_try_catch
     endfor
 
     subplot (2, 1, 1)

Modified: trunk/octave-forge/main/control/inst/bodemag.m
===================================================================
--- trunk/octave-forge/main/control/inst/bodemag.m	2012-09-15 07:07:18 UTC (rev 11025)
+++ trunk/octave-forge/main/control/inst/bodemag.m	2012-09-15 11:15:50 UTC (rev 11026)
@@ -73,7 +73,7 @@
 
     len = numel (H);  
     mag_args = {};
-    legend_args = cell (len, 1);
+    legend_args = {};
 
     for k = 1:len
       if (k == len)
@@ -83,7 +83,9 @@
       endif
       style = varargin(style_idx(style_idx > sys_idx(k) & style_idx <= lim));
       mag_args = cat (2, mag_args, w(k), mag_db(k), style);
-      legend_args{k} = inputname(sys_idx(k));  # watch out for bode (lticell{:})
+      try
+        legend_args = cat (2, legend_args, inputname(sys_idx(k)));  # watch out for bodemag (lticell{:})
+      end_try_catch
     endfor
 
     semilogx (mag_args{:})

Modified: trunk/octave-forge/main/control/inst/nichols.m
===================================================================
--- trunk/octave-forge/main/control/inst/nichols.m	2012-09-15 07:07:18 UTC (rev 11025)
+++ trunk/octave-forge/main/control/inst/nichols.m	2012-09-15 11:15:50 UTC (rev 11026)
@@ -86,7 +86,11 @@
       endif
       style = varargin(style_idx(style_idx > sys_idx(k) & style_idx <= lim));
       plot_args = cat (2, plot_args, pha(k), mag_db(k), style);
-      legend_args{k} = inputname(sys_idx(k));  # watch out for nichols (lticell{:})
+      try
+        legend_args{k} = inputname(sys_idx(k));
+      catch
+        legend_args{k} = "";
+      end_try_catch
     endfor
 
     plot (plot_args{:})

Modified: trunk/octave-forge/main/control/inst/nyquist.m
===================================================================
--- trunk/octave-forge/main/control/inst/nyquist.m	2012-09-15 07:07:18 UTC (rev 11025)
+++ trunk/octave-forge/main/control/inst/nyquist.m	2012-09-15 11:15:50 UTC (rev 11026)
@@ -94,7 +94,11 @@
         pos_args = cat (2, pos_args, re{k}, im{k}, style);
         neg_args = cat (2, neg_args, re{k}, -im{k}, style);      
       endif
-      legend_args{k} = inputname(sys_idx(k));
+      try
+        legend_args{k} = inputname(sys_idx(k));
+      catch
+        legend_args{k} = "";
+      end_try_catch
     endfor
     
     ## FIXME: pos_args = cat (2, pos_args, re{k}, im{k}, {"-", "color", col}, style);

Modified: trunk/octave-forge/main/control/inst/pzmap.m
===================================================================
--- trunk/octave-forge/main/control/inst/pzmap.m	2012-09-15 07:07:18 UTC (rev 11025)
+++ trunk/octave-forge/main/control/inst/pzmap.m	2012-09-15 11:15:50 UTC (rev 11026)
@@ -86,11 +86,14 @@
         pol_args = cat (2, pol_args, pol_re{k}, pol_im{k}, style);
         zer_args = cat (2, zer_args, zer_re{k}, zer_im{k}, style);     
       endif
+      try
+        legend_args{k} = inputname(sys_idx(k));
+      catch
+        legend_args{k} = "";
+      end_try_catch
+    endfor
       
-      ## FIXME: try to combine "x", "o" and style for custom colors
-      
-      legend_args{k} = inputname(sys_idx(k));
-    endfor
+    ## FIXME: try to combine "x", "o" and style for custom colors
 
     h = plot (pol_args{:}, zer_args{:});
     grid ("on")  

Modified: trunk/octave-forge/main/control/inst/sigma.m
===================================================================
--- trunk/octave-forge/main/control/inst/sigma.m	2012-09-15 07:07:18 UTC (rev 11025)
+++ trunk/octave-forge/main/control/inst/sigma.m	2012-09-15 11:15:50 UTC (rev 11026)
@@ -106,7 +106,11 @@
       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{:})
+      try
+        legend_args{k} = inputname(sys_idx(k));  # watch out for sigma (lticell{:})
+      catch
+        legend_args{k} = "";
+      end_try_catch
     endfor
 
     ## adjust line colors in legend  

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.