From: <et...@us...> - 2010-01-22 05:50:30
|
Revision: 6793 http://octave.svn.sourceforge.net/octave/?rev=6793&view=rev Author: etienne Date: 2010-01-22 05:50:23 +0000 (Fri, 22 Jan 2010) Log Message: ----------- Warn about non-visible plots Modified Paths: -------------- trunk/octave-forge/extra/gnuplot/inst/g_demo.m trunk/octave-forge/extra/gnuplot/inst/g_ez.m Modified: trunk/octave-forge/extra/gnuplot/inst/g_demo.m =================================================================== --- trunk/octave-forge/extra/gnuplot/inst/g_demo.m 2010-01-22 05:29:58 UTC (rev 6792) +++ trunk/octave-forge/extra/gnuplot/inst/g_demo.m 2010-01-22 05:50:23 UTC (rev 6793) @@ -10,6 +10,8 @@ image_tpl = "g_demo_plots-%i.eps" printf ("Plotting two dashed circles w/ a connection\n"); + printf ("\n\tNote: You may need to resize the window to see the plots\n\n"); + gg = g_new("COL",3,"geometry",[256,256]); tt = linspace (0,2*pi,65); xx = [sin(tt);cos(tt)]'; gg = g_data (gg,"-join","-step",3,"x",xx,xx/2); Modified: trunk/octave-forge/extra/gnuplot/inst/g_ez.m =================================================================== --- trunk/octave-forge/extra/gnuplot/inst/g_ez.m 2010-01-22 05:29:58 UTC (rev 6792) +++ trunk/octave-forge/extra/gnuplot/inst/g_ez.m 2010-01-22 05:50:23 UTC (rev 6793) @@ -457,6 +457,8 @@ %!demo +%! printf ("\n\tNote: You may need to resize the window to see the plots\n\n"); +%! %------------------------------------------------- %! im = rand(16,31); %! im(3:10,5:25) = linspace(0,0.5,8)'*ones(1,21)+ones(8,1)*linspace(0,0.5,21); %! g_ez ("title","A random grey image","plot",im, "img") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <et...@us...> - 2010-02-18 06:22:19
|
Revision: 6922 http://octave.svn.sourceforge.net/octave/?rev=6922&view=rev Author: etienne Date: 2010-02-18 06:22:10 +0000 (Thu, 18 Feb 2010) Log Message: ----------- Replace create_set() by unique(), struct_contains() by isfield() Modified Paths: -------------- trunk/octave-forge/extra/gnuplot/inst/_g_image_cmd.m trunk/octave-forge/extra/gnuplot/inst/_g_instantiate.m trunk/octave-forge/extra/gnuplot/inst/g_cmd.m trunk/octave-forge/extra/gnuplot/inst/g_data.m trunk/octave-forge/extra/gnuplot/inst/g_ez.m trunk/octave-forge/extra/gnuplot/inst/g_plot.m trunk/octave-forge/extra/gnuplot/inst/myimage.m Modified: trunk/octave-forge/extra/gnuplot/inst/_g_image_cmd.m =================================================================== --- trunk/octave-forge/extra/gnuplot/inst/_g_image_cmd.m 2010-02-18 06:08:10 UTC (rev 6921) +++ trunk/octave-forge/extra/gnuplot/inst/_g_image_cmd.m 2010-02-18 06:22:10 UTC (rev 6922) @@ -15,11 +15,11 @@ ## i : Number of arguments used in va. function [fmt, extra, i, zrange] = _g_image_cmd (sz, zrange, args, va) -if ! struct_contains (args, "xrange") +if ! isfield (args, "xrange") args.xrange = [0,sz(2)]; end -if ! struct_contains (args, "yrange") +if ! isfield (args, "yrange") args.yrange = [0,sz(1)]; end Modified: trunk/octave-forge/extra/gnuplot/inst/_g_instantiate.m =================================================================== --- trunk/octave-forge/extra/gnuplot/inst/_g_instantiate.m 2010-02-18 06:08:10 UTC (rev 6921) +++ trunk/octave-forge/extra/gnuplot/inst/_g_instantiate.m 2010-02-18 06:22:10 UTC (rev 6922) @@ -22,7 +22,7 @@ for i = 1:length (toks), kword_cnt.(toks{i}{1}) = 1; end # Get all values - if struct_contains (g, "values"), + if isfield (g, "values"), if !isstruct (g.values) error ("g.values should be a struct. Got a %s",typeinfo (g.values)); endif @@ -35,7 +35,7 @@ # Substitution for [dumv, kword] = kword_cnt - if struct_contains (vals, kword) + if isfield (vals, kword) value = vals.(kword); if !ischar (value), value = sprintf ("%g",value); endif Modified: trunk/octave-forge/extra/gnuplot/inst/g_cmd.m =================================================================== --- trunk/octave-forge/extra/gnuplot/inst/g_cmd.m 2010-02-18 06:08:10 UTC (rev 6921) +++ trunk/octave-forge/extra/gnuplot/inst/g_cmd.m 2010-02-18 06:22:10 UTC (rev 6922) @@ -118,7 +118,7 @@ g2 = _g_instantiate (varargin{i++}); - if 1 ## && struct_contains (g2, "local") && g2.local + if 1 ## && isfield (g2, "local") && g2.local g.owns = {g.owns{:}, g2.dir}; g.owns = {g.owns{:}, g2.owns{:}}; @@ -177,7 +177,7 @@ if i > length (g.cmds) # If there's none, put one at the head. multiplot_cmd = "set multiplot"; - if struct_contains (g.values, "title") + if isfield (g.values, "title") multiplot_cmd = [multiplot_cmd," '",g.values.title,"'"]; endif g.cmds = {multiplot_cmd,\ Modified: trunk/octave-forge/extra/gnuplot/inst/g_data.m =================================================================== --- trunk/octave-forge/extra/gnuplot/inst/g_data.m 2010-02-18 06:08:10 UTC (rev 6921) +++ trunk/octave-forge/extra/gnuplot/inst/g_data.m 2010-02-18 06:22:10 UTC (rev 6922) @@ -120,7 +120,7 @@ stops = cumsum(!stop0)(find (stop0)); endif - stops = create_set (stops); + stops = unique (stops); _g_save_data ([g.dir,"/",name], data, stops,label); else # Raw data filename = [g.dir,"/",name]; Modified: trunk/octave-forge/extra/gnuplot/inst/g_ez.m =================================================================== --- trunk/octave-forge/extra/gnuplot/inst/g_ez.m 2010-02-18 06:08:10 UTC (rev 6921) +++ trunk/octave-forge/extra/gnuplot/inst/g_ez.m 2010-02-18 06:22:10 UTC (rev 6922) @@ -249,7 +249,7 @@ data2 = reshape (data(:,2), nbox, datlen)'; else datindices = data(:,1); - #data1 = create_set (data(:,1)); + #data1 = unique (data(:,1)); data1 = unique (data(:,1)); nbox = length (data1); data2 = data(:,2); @@ -319,12 +319,12 @@ # Transform args in a gnuplot_object - if struct_contains (args, "geometry"), g = g_new ("geometry", args.geometry); + if isfield (args, "geometry"), g = g_new ("geometry", args.geometry); else g = g_new (); endif # Special case: quote title - #if struct_contains (args, "title"), args.title = ["'",args.title,"'"]; endif + #if isfield (args, "title"), args.title = ["'",args.title,"'"]; endif if length (args.cmds), g = g_cmd (g, args.cmds{:}); endif @@ -334,7 +334,7 @@ "xlabel", "ylabel", "x2label", "y2label", \ "grid", "xgrid", "ygrid"}; for i = 1:length(tmp) - if struct_contains (args, tmp{i}) + if isfield (args, tmp{i}) value = args.(tmp{i}); val_str = _g_stringify (tmp{i}, value); g = g_cmd (g,["set ",tmp{i}," ",val_str,""]); @@ -353,9 +353,9 @@ Ztics = [Z,"tics"]; Zrange = [Z,"range"]; - if ! isempty (args.(Zmap)) && ! struct_contains (args,Ztics) # Must figure tics for map + if ! isempty (args.(Zmap)) && ! isfield (args,Ztics) # Must figure tics for map - if struct_contains(args,Zrange) # Determine range + if isfield(args,Zrange) # Determine range rng = args.(Zrange); else rng = [inf,-inf]; @@ -369,7 +369,7 @@ end args.(Ztics) = _g_default_tics (rng); end - if struct_contains(args,Ztics) + if isfield(args,Ztics) if isempty (args.(Ztics)) # No tics @@ -436,11 +436,11 @@ if filename, g = g_plot (g,filename,extras{:}); else g = g_plot (g,extras{:}); endif - if struct_contains (g, "double_clicks") + if isfield (g, "double_clicks") printf ("Double-clicked locations:\n"); g.double_clicks end - if struct_contains (g, "middle_clicks") + if isfield (g, "middle_clicks") printf ("Middle-clicked locations:\n"); g.middle_clicks end Modified: trunk/octave-forge/extra/gnuplot/inst/g_plot.m =================================================================== --- trunk/octave-forge/extra/gnuplot/inst/g_plot.m 2010-02-18 06:08:10 UTC (rev 6921) +++ trunk/octave-forge/extra/gnuplot/inst/g_plot.m 2010-02-18 06:22:10 UTC (rev 6922) @@ -46,7 +46,7 @@ pos_cmd = {}; do_color = 1; - wait_for_q = struct_contains (g.values, "wait") && g.values.wait; + wait_for_q = isfield (g.values, "wait") && g.values.wait; if 0 eps_viewer = "ggv"; @@ -124,7 +124,7 @@ if do_eps if isempty (geometry) - if ! struct_contains (g.values, "geometry") + if ! isfield (g.values, "geometry") geometry = [10,8]; else geometry = g.values.geometry; @@ -137,7 +137,7 @@ endif elseif do_png if isempty (geometry) - if ! struct_contains (g.values, "geometry") + if ! isfield (g.values, "geometry") geometry = [600,400]; else geometry = g.values.geometry; @@ -209,7 +209,7 @@ endif gnuplot_options = [gnuplot_options," -geometry ",opt_str," "]; - elseif struct_contains (g.values, "geometry") + elseif isfield (g.values, "geometry") if !ischar (g.values.geometry), opt_str = sprintf ("%ix%i",g.values.geometry); else @@ -249,7 +249,7 @@ double_clicks(i,1) = eval (tokens{i}{1}); double_clicks(i,2) = eval (tokens{i}{2}); end - ##if struct_contains (g, "double_clicks") + ##if isfield (g, "double_clicks") ##g.double_clicks = [g.double_clicks; double_clicks]; ##else ## Keep only clicks from last plot @@ -265,7 +265,7 @@ middle_clicks(i,1) = eval (tokens{i}{1}); middle_clicks(i,2) = eval (tokens{i}{2}); end - ##if struct_contains (g, "middle_clicks") + ##if isfield (g, "middle_clicks") ##g.middle_clicks = [g.middle_clicks; middle_clicks]; ##else ## Keep only clicks from last plot Modified: trunk/octave-forge/extra/gnuplot/inst/myimage.m =================================================================== --- trunk/octave-forge/extra/gnuplot/inst/myimage.m 2010-02-18 06:08:10 UTC (rev 6921) +++ trunk/octave-forge/extra/gnuplot/inst/myimage.m 2010-02-18 06:22:10 UTC (rev 6922) @@ -211,7 +211,7 @@ if any (irng) < 0 error ("Range ( %s) is not positive",sprintf("%f ",irng)); endif -##length(create_set(im)) +##length(unique(im)) if !is_col || sameScale im-=imin; if irng @@ -332,7 +332,7 @@ #imin #imax -#length(create_set(im)) +#length(unique(im)) assert (all (im(:) >= 0 | isnan (im(:)))); assert (all (im(:) <= 255 | isnan (im(:)))); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |