Mercurial > hg > octave-nkf
changeset 17572:7bb76a22cde1
maint: Split scripts/plot directory into 4 pieces.
scripts/gui : user-interface functions
scripts/plot/appearance : functions controlling plot appearance
scripts/plot/draw : plotting functions which produce graphs
scripts/plot/util : low-level plotting functions and utilities.
* scripts/gui/guidata.m, scripts/gui/guihandles.m, scripts/gui/module.mk,
scripts/gui/private/__file_filter__.m,
scripts/gui/private/__fltk_file_filter__.m,
scripts/gui/private/__is_function__.m, scripts/gui/private/__uigetdir_fltk__.m,
scripts/gui/private/__uigetfile_fltk__.m,
scripts/gui/private/__uiobject_split_args__.m,
scripts/gui/private/__uiputfile_fltk__.m, scripts/gui/uicontextmenu.m,
scripts/gui/uicontrol.m, scripts/gui/uigetdir.m, scripts/gui/uigetfile.m,
scripts/gui/uimenu.m, scripts/gui/uipanel.m, scripts/gui/uipushtool.m,
scripts/gui/uiputfile.m, scripts/gui/uiresume.m, scripts/gui/uitoggletool.m,
scripts/gui/uitoolbar.m, scripts/gui/uiwait.m, scripts/gui/waitbar.m,
scripts/gui/waitforbuttonpress.m: Moved from scripts/plot to scripts/gui
* scripts/plot/appearance/__clabel__.m,
scripts/plot/appearance/__getlegenddata__.m, scripts/plot/appearance/axis.m,
scripts/plot/appearance/box.m, scripts/plot/appearance/caxis.m,
scripts/plot/appearance/clabel.m, scripts/plot/appearance/daspect.m,
scripts/plot/appearance/diffuse.m, scripts/plot/appearance/grid.m,
scripts/plot/appearance/gtext.m, scripts/plot/appearance/hidden.m,
scripts/plot/appearance/legend.m,
scripts/plot/appearance/orient.m, scripts/plot/appearance/pbaspect.m,
scripts/plot/appearance/private/__axis_label__.m,
scripts/plot/appearance/private/__axis_limits__.m,
scripts/plot/appearance/shading.m, scripts/plot/appearance/specular.m,
scripts/plot/appearance/text.m, scripts/plot/appearance/title.m,
scripts/plot/appearance/view.m, scripts/plot/appearance/whitebg.m,
scripts/plot/appearance/xlabel.m, scripts/plot/appearance/xlim.m,
scripts/plot/appearance/ylabel.m, scripts/plot/appearance/ylim.m,
scripts/plot/appearance/zlabel.m, scripts/plot/appearance/zlim.m:
Moved from scripts/plot to subdir appearance.
* scripts/plot/draw/area.m, scripts/plot/draw/bar.m, scripts/plot/draw/barh.m,
scripts/plot/draw/colorbar.m, scripts/plot/draw/comet.m,
scripts/plot/draw/comet3.m, scripts/plot/draw/compass.m,
scripts/plot/draw/contour.m, scripts/plot/draw/contour3.m,
scripts/plot/draw/contourc.m, scripts/plot/draw/contourf.m,
scripts/plot/draw/cylinder.m, scripts/plot/draw/ellipsoid.m,
scripts/plot/draw/errorbar.m, scripts/plot/draw/ezcontour.m,
scripts/plot/draw/ezcontourf.m, scripts/plot/draw/ezmesh.m,
scripts/plot/draw/ezmeshc.m, scripts/plot/draw/ezplot.m,
scripts/plot/draw/ezplot3.m, scripts/plot/draw/ezpolar.m,
scripts/plot/draw/ezsurf.m, scripts/plot/draw/ezsurfc.m,
scripts/plot/draw/feather.m, scripts/plot/draw/fill.m,
scripts/plot/draw/fplot.m, scripts/plot/draw/hist.m,
scripts/plot/draw/isocolors.m, scripts/plot/draw/isonormals.m,
scripts/plot/draw/isosurface.m, scripts/plot/draw/line.m,
scripts/plot/draw/loglog.m, scripts/plot/draw/loglogerr.m,
scripts/plot/draw/mesh.m, scripts/plot/draw/meshc.m, scripts/plot/draw/meshz.m,
scripts/plot/draw/pareto.m,
scripts/plot/draw/patch.m, scripts/plot/draw/pcolor.m,
scripts/plot/draw/peaks.m, scripts/plot/draw/pie.m, scripts/plot/draw/pie3.m,
scripts/plot/draw/plot.m, scripts/plot/draw/plot3.m,
scripts/plot/draw/plotmatrix.m, scripts/plot/draw/plotyy.m,
scripts/plot/draw/polar.m, scripts/plot/draw/private/__add_datasource__.m,
scripts/plot/draw/private/__bar__.m, scripts/plot/draw/private/__contour__.m,
scripts/plot/draw/private/__errcomm__.m,
scripts/plot/draw/private/__errplot__.m,
scripts/plot/draw/private/__ezplot__.m,
scripts/plot/draw/private/__interp_cube__.m,
scripts/plot/draw/private/__line__.m,
scripts/plot/draw/private/__marching_cube__.m,
scripts/plot/draw/private/__patch__.m, scripts/plot/draw/private/__pie__.m,
scripts/plot/draw/private/__plt__.m, scripts/plot/draw/private/__quiver__.m,
scripts/plot/draw/private/__scatter__.m, scripts/plot/draw/private/__stem__.m,
scripts/plot/draw/quiver.m, scripts/plot/draw/quiver3.m,
scripts/plot/draw/rectangle.m, scripts/plot/draw/ribbon.m,
scripts/plot/draw/rose.m, scripts/plot/draw/scatter.m,
scripts/plot/draw/scatter3.m, scripts/plot/draw/semilogx.m,
scripts/plot/draw/semilogxerr.m, scripts/plot/draw/semilogy.m,
scripts/plot/draw/semilogyerr.m, scripts/plot/draw/shrinkfaces.m,
scripts/plot/draw/slice.m, scripts/plot/draw/sombrero.m,
scripts/plot/draw/sphere.m, scripts/plot/draw/stairs.m,
scripts/plot/draw/stem.m, scripts/plot/draw/stem3.m,
scripts/plot/draw/stemleaf.m, scripts/plot/draw/surf.m,
scripts/plot/draw/surface.m, scripts/plot/draw/surfc.m,
scripts/plot/draw/surfl.m, scripts/plot/draw/surfnorm.m,
scripts/plot/draw/tetramesh.m, scripts/plot/draw/trimesh.m,
scripts/plot/draw/triplot.m, scripts/plot/draw/trisurf.m,
scripts/plot/draw/waterfall.m: Moved from plot/ to subdir draw.
* scripts/plot/util/__actual_axis_position__.m,
scripts/plot/util/__default_plot_options__.m,
scripts/plot/util/__gnuplot_drawnow__.m,
scripts/plot/util/__next_line_color__.m,
scripts/plot/util/__next_line_style__.m,
scripts/plot/util/__plt_get_axis_arg__.m, scripts/plot/util/__pltopt__.m,
scripts/plot/util/allchild.m, scripts/plot/util/ancestor.m,
scripts/plot/util/axes.m, scripts/plot/util/cla.m, scripts/plot/util/clf.m,
scripts/plot/util/close.m, scripts/plot/util/closereq.m,
scripts/plot/util/colstyle.m, scripts/plot/util/copyobj.m,
scripts/plot/util/figure.m, scripts/plot/util/findall.m,
scripts/plot/util/findfigs.m, scripts/plot/util/findobj.m,
scripts/plot/util/gca.m, scripts/plot/util/gcbf.m, scripts/plot/util/gcbo.m,
scripts/plot/util/gcf.m, scripts/plot/util/gco.m, scripts/plot/util/ginput.m,
scripts/plot/util/gnuplot_binary.in, scripts/plot/util/graphics_toolkit.m,
scripts/plot/util/hdl2struct.m, scripts/plot/util/hggroup.m,
scripts/plot/util/hold.m, scripts/plot/util/isaxes.m,
scripts/plot/util/isfigure.m, scripts/plot/util/ishghandle.m,
scripts/plot/util/ishold.m, scripts/plot/util/isprop.m,
scripts/plot/util/linkprop.m, scripts/plot/util/meshgrid.m,
scripts/plot/util/ndgrid.m,
scripts/plot/util/newplot.m, scripts/plot/util/print.m,
scripts/plot/util/printd.m, scripts/plot/util/private/__add_default_menu__.m,
scripts/plot/util/private/__fltk_ginput__.m,
scripts/plot/util/private/__fltk_print__.m,
scripts/plot/util/private/__ghostscript__.m,
scripts/plot/util/private/__gnuplot_get_var__.m,
scripts/plot/util/private/__gnuplot_ginput__.m,
scripts/plot/util/private/__gnuplot_has_feature__.m,
scripts/plot/util/private/__gnuplot_has_terminal__.m,
scripts/plot/util/private/__gnuplot_open_stream__.m,
scripts/plot/util/private/__gnuplot_print__.m,
scripts/plot/util/private/__gnuplot_version__.m,
scripts/plot/util/private/__go_draw_axes__.m,
scripts/plot/util/private/__go_draw_figure__.m,
scripts/plot/util/private/__print_parse_opts__.m,
scripts/plot/util/private/__tight_eps_bbox__.m, scripts/plot/util/refresh.m,
scripts/plot/util/refreshdata.m, scripts/plot/util/saveas.m,
scripts/plot/util/shg.m, scripts/plot/util/struct2hdl.m,
scripts/plot/util/subplot.m: Moved from plot to subdir util.
* etc/HACKING: Updated directory structure info.
* scripts/Makefile.am, scripts/plot/appearance/module.mk,
scripts/plot/draw/module.mk, scripts/plot/util/module.mk:
Added new directories to build system.
line wrap: on
line diff
--- a/etc/HACKING +++ b/etc/HACKING @@ -271,6 +271,8 @@ geometry geometry algorithms + gui User-Interface (UI) functions + help help subsystem functions image image processing @@ -318,15 +320,15 @@ test_ .m fixed tests for the interpreter - fntests.m script to run function tests embedded in C++ and .m - files + fntests.m script to run function tests embedded in C++ and + .m files ---- John W. Eaton jwe@octave.org +Last updated: Fri, 4 Oct 2013 16:58:52 PDT -Last updated: Wed, 15 May 2013 03:02:45 EDT ################################################################################
--- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -47,6 +47,7 @@ include elfun/module.mk include general/module.mk include geometry/module.mk +include gui/module.mk include help/module.mk include image/module.mk include io/module.mk @@ -56,7 +57,9 @@ include optimization/module.mk include path/module.mk include pkg/module.mk -include plot/module.mk +include plot/appearance/module.mk +include plot/draw/module.mk +include plot/util/module.mk include polynomial/module.mk include prefs/module.mk include set/module.mk @@ -112,6 +115,10 @@ $(srcdir)/mk-pkg-add $(srcdir) $(geometry_FCN_FILES) -- $(geometry_GEN_FCN_FILES) > $@-t mv $@-t $@ +gui/PKG_ADD: $(gui_FCN_FILES) $(gui_GEN_FCN_FILES) gui/$(octave_dirstamp) mk-pkg-add + $(srcdir)/mk-pkg-add $(srcdir) $(gui_FCN_FILES) -- $(gui_GEN_FCN_FILES) > $@-t + mv $@-t $@ + help/PKG_ADD: $(help_FCN_FILES) $(help_GEN_FCN_FILES) help/$(octave_dirstamp) mk-pkg-add $(srcdir)/mk-pkg-add $(srcdir) $(help_FCN_FILES) -- $(help_GEN_FCN_FILES) > $@-t mv $@-t $@ @@ -148,8 +155,16 @@ $(srcdir)/mk-pkg-add $(srcdir) $(pkg_FCN_FILES) -- $(pkg_GEN_FCN_FILES) > $@-t mv $@-t $@ -plot/PKG_ADD: $(plot_FCN_FILES) $(plot_GEN_FCN_FILES) plot/$(octave_dirstamp) mk-pkg-add - $(srcdir)/mk-pkg-add $(srcdir) $(plot_FCN_FILES) -- $(plot_GEN_FCN_FILES) > $@-t +plot/appearance/PKG_ADD: $(plot_appearance_FCN_FILES) $(plot_appearance_GEN_FCN_FILES) plot/appearance/$(octave_dirstamp) mk-pkg-add + $(srcdir)/mk-pkg-add $(srcdir) $(plot_appearance_FCN_FILES) -- $(plot_appearance_GEN_FCN_FILES) > $@-t + mv $@-t $@ + +plot/draw/PKG_ADD: $(plot_draw_FCN_FILES) $(plot_draw_GEN_FCN_FILES) plot/draw/$(octave_dirstamp) mk-pkg-add + $(srcdir)/mk-pkg-add $(srcdir) $(plot_draw_FCN_FILES) -- $(plot_draw_GEN_FCN_FILES) > $@-t + mv $@-t $@ + +plot/util/PKG_ADD: $(plot_util_FCN_FILES) $(plot_util_GEN_FCN_FILES) plot/util/$(octave_dirstamp) mk-pkg-add + $(srcdir)/mk-pkg-add $(srcdir) $(plot_util_FCN_FILES) -- $(plot_util_GEN_FCN_FILES) > $@-t mv $@-t $@ polynomial/PKG_ADD: $(polynomial_FCN_FILES) $(polynomial_GEN_FCN_FILES) polynomial/$(octave_dirstamp) mk-pkg-add @@ -222,6 +237,7 @@ $(elfun_GEN_FCN_FILES): elfun/$(octave_dirstamp) $(general_GEN_FCN_FILES): general/$(octave_dirstamp) $(geometry_GEN_FCN_FILES): geometry/$(octave_dirstamp) +$(gui_GEN_FCN_FILES): gui/$(octave_dirstamp) $(help_GEN_FCN_FILES): help/$(octave_dirstamp) $(image_GEN_FCN_FILES): image/$(octave_dirstamp) $(io_GEN_FCN_FILES): io/$(octave_dirstamp) @@ -231,7 +247,9 @@ $(optimization_GEN_FCN_FILES): optimization/$(octave_dirstamp) $(path_GEN_FCN_FILES): path/$(octave_dirstamp) $(pkg_GEN_FCN_FILES): pkg/$(octave_dirstamp) -$(plot_GEN_FCN_FILES): plot/$(octave_dirstamp) +$(plot_appearance_GEN_FCN_FILES): plot/appearance/$(octave_dirstamp) +$(plot_draw_GEN_FCN_FILES): plot/draw/$(octave_dirstamp) +$(plot_util_GEN_FCN_FILES): plot/util/$(octave_dirstamp) $(polynomial_GEN_FCN_FILES): polynomial/$(octave_dirstamp) $(prefs_GEN_FCN_FILES): prefs/$(octave_dirstamp) $(set_GEN_FCN_FILES): set/$(octave_dirstamp) @@ -267,6 +285,9 @@ geometry/$(octave_dirstamp): $(MKDIR_P) geometry : > geometry/$(octave_dirstamp) +gui/$(octave_dirstamp): + $(MKDIR_P) gui + : > gui/$(octave_dirstamp) help/$(octave_dirstamp): $(MKDIR_P) help : > help/$(octave_dirstamp) @@ -294,9 +315,15 @@ pkg/$(octave_dirstamp): $(MKDIR_P) pkg : > pkg/$(octave_dirstamp) -plot/$(octave_dirstamp): - $(MKDIR_P) plot - : > plot/$(octave_dirstamp) +plot/appearance/$(octave_dirstamp): + $(MKDIR_P) plot/appearance + : > plot/appearance/$(octave_dirstamp) +plot/draw/$(octave_dirstamp): + $(MKDIR_P) plot/draw + : > plot/draw/$(octave_dirstamp) +plot/util/$(octave_dirstamp): + $(MKDIR_P) plot/util + : > plot/util/$(octave_dirstamp) polynomial/$(octave_dirstamp): $(MKDIR_P) polynomial : > polynomial/$(octave_dirstamp)
new file mode 100644 --- /dev/null +++ b/scripts/gui/module.mk @@ -0,0 +1,35 @@ +FCN_FILE_DIRS += gui + +gui_PRIVATE_FCN_FILES = \ + gui/private/__file_filter__.m \ + gui/private/__fltk_file_filter__.m \ + gui/private/__is_function__.m \ + gui/private/__uigetdir_fltk__.m \ + gui/private/__uigetfile_fltk__.m \ + gui/private/__uiobject_split_args__.m \ + gui/private/__uiputfile_fltk__.m + +gui_FCN_FILES = \ + gui/guidata.m \ + gui/guihandles.m \ + gui/uicontextmenu.m \ + gui/uicontrol.m \ + gui/uigetdir.m \ + gui/uigetfile.m \ + gui/uimenu.m \ + gui/uipanel.m \ + gui/uipushtool.m \ + gui/uiputfile.m \ + gui/uiresume.m \ + gui/uitoggletool.m \ + gui/uitoolbar.m \ + gui/uiwait.m \ + gui/waitbar.m \ + gui/waitforbuttonpress.m \ + $(gui_PRIVATE_FCN_FILES) + +FCN_FILES += $(gui_FCN_FILES) + +PKG_ADD_FILES += gui/PKG_ADD + +DIRSTAMP_FILES += gui/$(octave_dirstamp)
rename from scripts/plot/private/__fltk_file_filter__.m rename to scripts/gui/private/__fltk_file_filter__.m
rename from scripts/plot/private/__uigetdir_fltk__.m rename to scripts/gui/private/__uigetdir_fltk__.m
rename from scripts/plot/private/__uigetfile_fltk__.m rename to scripts/gui/private/__uigetfile_fltk__.m
rename from scripts/plot/private/__uiobject_split_args__.m rename to scripts/gui/private/__uiobject_split_args__.m
rename from scripts/plot/private/__uiputfile_fltk__.m rename to scripts/gui/private/__uiputfile_fltk__.m
rename from scripts/plot/private/__getlegenddata__.m rename to scripts/plot/appearance/__getlegenddata__.m
new file mode 100644 --- /dev/null +++ b/scripts/plot/appearance/module.mk @@ -0,0 +1,41 @@ +FCN_FILE_DIRS += plot/appearance + +plot_appearance_PRIVATE_FCN_FILES = \ + plot/appearance/private/__axes_limits__.m \ + plot/appearance/private/__axis_label__.m + +plot_appearance_FCN_FILES = \ + plot/appearance/__clabel__.m \ + plot/appearance/__getlegenddata__.m \ + plot/appearance/axis.m \ + plot/appearance/box.m \ + plot/appearance/caxis.m \ + plot/appearance/clabel.m \ + plot/appearance/daspect.m \ + plot/appearance/diffuse.m \ + plot/appearance/grid.m \ + plot/appearance/gtext.m \ + plot/appearance/hidden.m \ + plot/appearance/legend.m \ + plot/appearance/orient.m \ + plot/appearance/pbaspect.m \ + plot/appearance/shading.m \ + plot/appearance/specular.m \ + plot/appearance/text.m \ + plot/appearance/title.m \ + plot/appearance/view.m \ + plot/appearance/whitebg.m \ + plot/appearance/xlabel.m \ + plot/appearance/xlim.m \ + plot/appearance/ylabel.m \ + plot/appearance/ylim.m \ + plot/appearance/zlabel.m \ + plot/appearance/zlim.m \ + $(plot_appearance_PRIVATE_FCN_FILES) + +FCN_FILES += $(plot_appearance_FCN_FILES) + +PKG_ADD_FILES += plot/appearance/PKG_ADD + +DIRSTAMP_FILES += plot/appearance/$(octave_dirstamp) +
rename from scripts/plot/private/__axis_label__.m rename to scripts/plot/appearance/private/__axis_label__.m
rename from scripts/plot/private/__axes_limits__.m rename to scripts/plot/appearance/private/__axis_limits__.m
rename from scripts/plot/xlim.m rename to scripts/plot/appearance/xlim.m --- a/scripts/plot/xlim.m +++ b/scripts/plot/appearance/xlim.m @@ -41,7 +41,7 @@ ## @end deftypefn function retval = xlim (varargin) - ret = __axes_limits__ ("xlim", varargin{:}); + ret = __axis_limits__ ("xlim", varargin{:}); if (! isempty (ret)) retval = ret;
rename from scripts/plot/ylim.m rename to scripts/plot/appearance/ylim.m --- a/scripts/plot/ylim.m +++ b/scripts/plot/appearance/ylim.m @@ -41,7 +41,7 @@ ## @end deftypefn function retval = ylim (varargin) - ret = __axes_limits__ ("ylim", varargin{:}); + ret = __axis_limits__ ("ylim", varargin{:}); if (! isempty (ret)) retval = ret;
rename from scripts/plot/zlim.m rename to scripts/plot/appearance/zlim.m --- a/scripts/plot/zlim.m +++ b/scripts/plot/appearance/zlim.m @@ -41,7 +41,7 @@ ## @end deftypefn function retval = zlim (varargin) - ret = __axes_limits__ ("zlim", varargin{:}); + ret = __axis_limits__ ("zlim", varargin{:}); if (! isempty (ret)) retval = ret;
new file mode 100644 --- /dev/null +++ b/scripts/plot/draw/module.mk @@ -0,0 +1,104 @@ +FCN_FILE_DIRS += plot/draw + +plot_draw_PRIVATE_FCN_FILES = \ + plot/draw/private/__add_datasource__.m \ + plot/draw/private/__bar__.m \ + plot/draw/private/__contour__.m \ + plot/draw/private/__errcomm__.m \ + plot/draw/private/__errplot__.m \ + plot/draw/private/__ezplot__.m \ + plot/draw/private/__interp_cube__.m \ + plot/draw/private/__line__.m \ + plot/draw/private/__marching_cube__.m \ + plot/draw/private/__patch__.m \ + plot/draw/private/__pie__.m \ + plot/draw/private/__plt__.m \ + plot/draw/private/__quiver__.m \ + plot/draw/private/__scatter__.m \ + plot/draw/private/__stem__.m + +plot_draw_FCN_FILES = \ + plot/draw/area.m \ + plot/draw/barh.m \ + plot/draw/bar.m \ + plot/draw/colorbar.m \ + plot/draw/comet3.m \ + plot/draw/comet.m \ + plot/draw/compass.m \ + plot/draw/contour3.m \ + plot/draw/contourc.m \ + plot/draw/contourf.m \ + plot/draw/contour.m \ + plot/draw/cylinder.m \ + plot/draw/ellipsoid.m \ + plot/draw/errorbar.m \ + plot/draw/ezcontourf.m \ + plot/draw/ezcontour.m \ + plot/draw/ezmeshc.m \ + plot/draw/ezmesh.m \ + plot/draw/ezplot3.m \ + plot/draw/ezplot.m \ + plot/draw/ezpolar.m \ + plot/draw/ezsurfc.m \ + plot/draw/ezsurf.m \ + plot/draw/feather.m \ + plot/draw/fill.m \ + plot/draw/fplot.m \ + plot/draw/hist.m \ + plot/draw/isocolors.m \ + plot/draw/isonormals.m \ + plot/draw/isosurface.m \ + plot/draw/line.m \ + plot/draw/loglogerr.m \ + plot/draw/loglog.m \ + plot/draw/meshc.m \ + plot/draw/mesh.m \ + plot/draw/meshz.m \ + plot/draw/pareto.m \ + plot/draw/patch.m \ + plot/draw/pcolor.m \ + plot/draw/peaks.m \ + plot/draw/pie3.m \ + plot/draw/pie.m \ + plot/draw/plot3.m \ + plot/draw/plot.m \ + plot/draw/plotmatrix.m \ + plot/draw/plotyy.m \ + plot/draw/polar.m \ + plot/draw/quiver3.m \ + plot/draw/quiver.m \ + plot/draw/rectangle.m \ + plot/draw/ribbon.m \ + plot/draw/rose.m \ + plot/draw/scatter3.m \ + plot/draw/scatter.m \ + plot/draw/semilogxerr.m \ + plot/draw/semilogx.m \ + plot/draw/semilogyerr.m \ + plot/draw/semilogy.m \ + plot/draw/shrinkfaces.m \ + plot/draw/slice.m \ + plot/draw/sombrero.m \ + plot/draw/sphere.m \ + plot/draw/stairs.m \ + plot/draw/stem3.m \ + plot/draw/stemleaf.m \ + plot/draw/stem.m \ + plot/draw/surface.m \ + plot/draw/surfc.m \ + plot/draw/surfl.m \ + plot/draw/surf.m \ + plot/draw/surfnorm.m \ + plot/draw/tetramesh.m \ + plot/draw/trimesh.m \ + plot/draw/triplot.m \ + plot/draw/trisurf.m \ + plot/draw/waterfall.m \ + $(plot_draw_PRIVATE_FCN_FILES) + +FCN_FILES += $(plot_draw_FCN_FILES) + +PKG_ADD_FILES += plot/draw/PKG_ADD + +DIRSTAMP_FILES += plot/draw/$(octave_dirstamp) +
rename from scripts/plot/private/__add_datasource__.m rename to scripts/plot/draw/private/__add_datasource__.m
rename from scripts/plot/private/__interp_cube__.m rename to scripts/plot/draw/private/__interp_cube__.m
rename from scripts/plot/private/__marching_cube__.m rename to scripts/plot/draw/private/__marching_cube__.m
rename from scripts/plot/stairs.m rename to scripts/plot/draw/stairs.m --- a/scripts/plot/stairs.m +++ b/scripts/plot/draw/stairs.m @@ -238,10 +238,10 @@ function update_props (h, ~) set (get (h, "children"), - {"color", "linestyle", "linewidth", "marker", "markeredgecolor", - "markerfacecolor", "markersize", "markersize"}, - get (h, {"color", "linestyle", "linewidth", "marker", "markeredgecolor", - "markerfacecolor", "markersize", "markersize"})); + {"color", "linestyle", "linewidth", "marker", ... + "markeredgecolor", "markerfacecolor", "markersize"}, + get (h, {"color", "linestyle", "linewidth", "marker", ... + "markeredgecolor", "markerfacecolor", "markersize"})); endfunction function update_data (h, ~)
rename from scripts/plot/private/__actual_axis_position__.m rename to scripts/plot/util/__actual_axis_position__.m
rename from scripts/plot/private/__default_plot_options__.m rename to scripts/plot/util/__default_plot_options__.m
rename from scripts/plot/private/__next_line_color__.m rename to scripts/plot/util/__next_line_color__.m
rename from scripts/plot/private/__next_line_style__.m rename to scripts/plot/util/__next_line_style__.m
rename from scripts/plot/copyobj.m rename to scripts/plot/util/copyobj.m --- a/scripts/plot/copyobj.m +++ b/scripts/plot/util/copyobj.m @@ -84,9 +84,10 @@ %! legend ('errorbar', 'line'); %! hnew = copyobj (hdl); -%!demo -%! ## FIXME: This demo fails occasionally for an obscure reason. +%!#demo +%! ## FIXME: This demo fails for an obscure reason. %! ## It appears that there is something wrong with Octave code for patches. +%! ## This demo must remain commented out until patch() has been reworked. %! unwind_protect %! hdl = figure (1234); %! clf;
new file mode 100644 --- /dev/null +++ b/scripts/plot/util/module.mk @@ -0,0 +1,80 @@ +FCN_FILE_DIRS += plot + +plot_util_GEN_FCN_FILES = \ + plot/util/gnuplot_binary.m + +GEN_FCN_FILES += $(plot_util_GEN_FCN_FILES) + +plot_util_PRIVATE_FCN_FILES = \ + plot/util/private/__add_default_menu__.m \ + plot/util/private/__fltk_ginput__.m \ + plot/util/private/__fltk_print__.m \ + plot/util/private/__ghostscript__.m \ + plot/util/private/__gnuplot_get_var__.m \ + plot/util/private/__gnuplot_ginput__.m \ + plot/util/private/__gnuplot_has_feature__.m \ + plot/util/private/__gnuplot_has_terminal__.m \ + plot/util/private/__gnuplot_open_stream__.m \ + plot/util/private/__gnuplot_print__.m \ + plot/util/private/__gnuplot_version__.m \ + plot/util/private/__go_draw_axes__.m \ + plot/util/private/__go_draw_figure__.m \ + plot/util/private/__print_parse_opts__.m \ + plot/util/private/__tight_eps_bbox__.m + +plot_util_FCN_FILES = \ + plot/util/__actual_axis_position__.m \ + plot/util/allchild.m \ + plot/util/ancestor.m \ + plot/util/axes.m \ + plot/util/cla.m \ + plot/util/clf.m \ + plot/util/close.m \ + plot/util/closereq.m \ + plot/util/colstyle.m \ + plot/util/copyobj.m \ + plot/util/__default_plot_options__.m \ + plot/util/figure.m \ + plot/util/findall.m \ + plot/util/findfigs.m \ + plot/util/findobj.m \ + plot/util/gca.m \ + plot/util/gcbf.m \ + plot/util/gcbo.m \ + plot/util/gcf.m \ + plot/util/gco.m \ + plot/util/ginput.m \ + plot/util/__gnuplot_drawnow__.m \ + plot/util/graphics_toolkit.m \ + plot/util/hdl2struct.m \ + plot/util/hggroup.m \ + plot/util/hold.m \ + plot/util/isaxes.m \ + plot/util/isfigure.m \ + plot/util/ishghandle.m \ + plot/util/ishold.m \ + plot/util/isprop.m \ + plot/util/linkprop.m \ + plot/util/meshgrid.m \ + plot/util/ndgrid.m \ + plot/util/newplot.m \ + plot/util/__next_line_color__.m \ + plot/util/__next_line_style__.m \ + plot/util/__plt_get_axis_arg__.m \ + plot/util/__pltopt__.m \ + plot/util/printd.m \ + plot/util/print.m \ + plot/util/refreshdata.m \ + plot/util/refresh.m \ + plot/util/saveas.m \ + plot/util/shg.m \ + plot/util/struct2hdl.m \ + plot/util/subplot.m \ + $(plot_util_PRIVATE_FCN_FILES) + +FCN_FILES += $(plot_util_FCN_FILES) + +PKG_ADD_FILES += plot/util/PKG_ADD + +DIRSTAMP_FILES += plot/util/$(octave_dirstamp) +
rename from scripts/plot/private/__add_default_menu__.m rename to scripts/plot/util/private/__add_default_menu__.m
rename from scripts/plot/private/__fltk_ginput__.m rename to scripts/plot/util/private/__fltk_ginput__.m
rename from scripts/plot/private/__fltk_print__.m rename to scripts/plot/util/private/__fltk_print__.m
rename from scripts/plot/private/__ghostscript__.m rename to scripts/plot/util/private/__ghostscript__.m
rename from scripts/plot/private/__gnuplot_get_var__.m rename to scripts/plot/util/private/__gnuplot_get_var__.m
rename from scripts/plot/private/__gnuplot_ginput__.m rename to scripts/plot/util/private/__gnuplot_ginput__.m
rename from scripts/plot/private/__gnuplot_has_feature__.m rename to scripts/plot/util/private/__gnuplot_has_feature__.m
rename from scripts/plot/private/__gnuplot_has_terminal__.m rename to scripts/plot/util/private/__gnuplot_has_terminal__.m
rename from scripts/plot/private/__gnuplot_open_stream__.m rename to scripts/plot/util/private/__gnuplot_open_stream__.m
rename from scripts/plot/private/__gnuplot_print__.m rename to scripts/plot/util/private/__gnuplot_print__.m
rename from scripts/plot/private/__gnuplot_version__.m rename to scripts/plot/util/private/__gnuplot_version__.m
rename from scripts/plot/private/__go_draw_axes__.m rename to scripts/plot/util/private/__go_draw_axes__.m
rename from scripts/plot/private/__go_draw_figure__.m rename to scripts/plot/util/private/__go_draw_figure__.m
rename from scripts/plot/private/__print_parse_opts__.m rename to scripts/plot/util/private/__print_parse_opts__.m