Mercurial > hg > octave-nkf

changeset 20610:755ba248fb4a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: Rename __go_draw_XXX to __gnuplot_draw_XXX for clarity. * scripts/plot/util/private/__gnuplot_draw_axes__.m: Renamed from __go_draw_axes__.m * scripts/plot/util/private/__gnuplot_draw_figure__.m: Renamed from __go_draw_figure__.m * __scatter__.m, __gnuplot_drawnow__.m: Update scripts to use new names. * scripts/plot/util/module.mk: Use new file names in build system.
author Rik <rik@octave.org>
date Sun, 26 Jul 2015 18:33:57 -0700
parents 26bd6008fc9c
children 905fc6b85b4c
files scripts/plot/draw/private/__scatter__.m scripts/plot/util/__gnuplot_drawnow__.m scripts/plot/util/module.mk scripts/plot/util/private/__gnuplot_draw_axes__.m scripts/plot/util/private/__gnuplot_draw_figure__.m scripts/plot/util/private/__go_draw_axes__.m scripts/plot/util/private/__go_draw_figure__.m
diffstat 5 files changed, 19 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/plot/draw/private/__scatter__.m
+++ b/scripts/plot/draw/private/__scatter__.m
@@ -291,7 +291,7 @@
     toolkit = get (ancestor (hg, "figure"), "__graphics_toolkit__");
     ## Does gnuplot only support triangles with different vertex colors ?
     ## TODO: Verify gnuplot can only support one color.  If RGB triplets
-    ##       can be assigned to each vertex, then fix __go_draw_axes__.m
+    ##       can be assigned to each vertex, then fix __gnuplot_draw_axes__.m
     gnuplot_hack = (numel (x) > 1 && columns (c) == 3
                     && strcmp (toolkit, "gnuplot"));
     if (ischar (c) || ! isflat || gnuplot_hack)
--- a/scripts/plot/util/__gnuplot_drawnow__.m
+++ b/scripts/plot/util/__gnuplot_drawnow__.m
@@ -40,11 +40,11 @@
       gnuplot_supports_term = __gnuplot_has_terminal__ (term, plot_stream);
       if (gnuplot_supports_term)
         enhanced = gnuplot_set_term (plot_stream(1), true, h, term, file);
-        __go_draw_figure__ (h, plot_stream(1), enhanced, mono);
+        __gnuplot_draw_figure__ (h, plot_stream(1), enhanced, mono);
         if (nargin == 5)
           fid = fopen (debug_file, "wb");
           enhanced = gnuplot_set_term (fid, true, h, term, file);
-          __go_draw_figure__ (h, fid, enhanced, mono);
+          __gnuplot_draw_figure__ (h, fid, enhanced, mono);
         endif
       else
         error ('__gnuplot_drawnow__: the gnuplot terminal, "%s", is not available',
@@ -83,7 +83,7 @@
     else
       enhanced = gnuplot_set_term (plot_stream(1), new_stream, h, term);
     endif
-    __go_draw_figure__ (h, plot_stream(1), enhanced, mono);
+    __gnuplot_draw_figure__ (h, plot_stream(1), enhanced, mono);
     fflush (plot_stream(1));
     if (strcmp (term, "dumb"))
       fid = -1;
--- a/scripts/plot/util/module.mk
+++ b/scripts/plot/util/module.mk
@@ -17,8 +17,8 @@
   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/__gnuplot_draw_axes__.m \
+  scripts/plot/util/private/__gnuplot_draw_figure__.m \
   scripts/plot/util/private/__opengl_print__.m \
   scripts/plot/util/private/__print_parse_opts__.m \
   scripts/plot/util/private/__tight_eps_bbox__.m
rename from scripts/plot/util/private/__go_draw_axes__.m
rename to scripts/plot/util/private/__gnuplot_draw_axes__.m
--- a/scripts/plot/util/private/__go_draw_axes__.m
+++ b/scripts/plot/util/private/__gnuplot_draw_axes__.m
@@ -17,13 +17,13 @@
 ## <http://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
-## @deftypefn {Function File} {} __go_draw_axes__ (@var{h}, @var{plot_stream}, @var{enhanced}, @var{mono})
+## @deftypefn {Function File} {} __gnuplot_draw_axes__ (@var{h}, @var{plot_stream}, @var{enhanced}, @var{mono})
 ## Undocumented internal function.
 ## @end deftypefn
 
 ## Author: jwe
 
-function __go_draw_axes__ (h, plot_stream, enhanced, mono,
+function __gnuplot_draw_axes__ (h, plot_stream, enhanced, mono,
                            bg_is_set, fg_is_set, hlgnd)
 
   showhiddenhandles = get (0, "showhiddenhandles");
@@ -668,7 +668,7 @@
              endif
              if (nd == 3)
                if (numel (xcol) > 3)
-                 error ("__go_draw_axes__: gnuplot (as of v4.2) only supports 3-D filled triangular patches");
+                 error ("__gnuplot_draw_axes__: gnuplot (as of v4.2) only supports 3-D filled triangular patches");
                else
                  if (isnan (data_3d_idx))
                    data_idx++;
@@ -1169,7 +1169,7 @@
             err = true;
           endif
           if (err)
-            error ("__go_draw_axes__: invalid grid data");
+            error ("__gnuplot_draw_axes__: invalid grid data");
           endif
           xlen = columns (zdat);
           ylen = rows (zdat);
@@ -1397,7 +1397,7 @@
         endif
 
       otherwise
-        error ("__go_draw_axes__: unknown object class, %s",
+        error ("__gnuplot_draw_axes__: unknown object class, %s",
                obj.type);
     endswitch
 
@@ -2225,7 +2225,7 @@
   elseif (iscellstr (ticklabel))
     ticklabel = ticklabel;
   else
-    error ("__go_draw_axes__: unsupported type of ticklabel");
+    error ("__gnuplot_draw_axes__: unsupported type of ticklabel");
   endif
 endfunction
 
rename from scripts/plot/util/private/__go_draw_figure__.m
rename to scripts/plot/util/private/__gnuplot_draw_figure__.m
--- a/scripts/plot/util/private/__go_draw_figure__.m
+++ b/scripts/plot/util/private/__gnuplot_draw_figure__.m
@@ -17,13 +17,13 @@
 ## <http://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
-## @deftypefn {Function File} {} __go_draw_figure__ (@var{h}, @var{plot_stream}, @var{enhanced}, @var{mono})
+## @deftypefn {Function File} {} __gnuplot_draw_figure__ (@var{h}, @var{plot_stream}, @var{enhanced}, @var{mono})
 ## Undocumented internal function.
 ## @end deftypefn
 
 ## Author: jwe
 
-function __go_draw_figure__ (h, plot_stream, enhanced, mono)
+function __gnuplot_draw_figure__ (h, plot_stream, enhanced, mono)
 
   htype = get (h, "type");
   if (strcmp (htype, "figure"))
@@ -116,7 +116,7 @@
                   if (bg_is_set)
                     fprintf (plot_stream, "set border linecolor rgb \"#%02x%02x%02x\"\n", round (255 * (1 - bg)));
                   endif
-                  __go_draw_axes__ (kids(i), plot_stream, enhanced, mono,
+                  __gnuplot_draw_axes__ (kids(i), plot_stream, enhanced, mono,
                                     bg_is_set, false, hlgnd);
                 unwind_protect_cleanup
                   ## Return axes "units" and "position" back to
@@ -154,7 +154,7 @@
                   fprintf (plot_stream, "set border linecolor rgb \"#%02x%02x%02x\"\n", round (255 * (1 - bg)));
                 endif
                 ## Find if this axes has an associated legend axes and pass it
-                ## to __go_draw_axes__
+                ## to __gnuplot_draw_axes__
                 hlegend = [];
                 fkids = get (h, "children");
                 for j = 1 : numel (fkids)
@@ -169,7 +169,7 @@
                     endif
                   endif
                 endfor
-                __go_draw_axes__ (kids(i), plot_stream, enhanced, mono,
+                __gnuplot_draw_axes__ (kids(i), plot_stream, enhanced, mono,
                                   bg_is_set, fg_is_set, hlegend);
               unwind_protect_cleanup
                 ## Return axes "units" and "position" back to
@@ -184,7 +184,7 @@
             ## ignore uimenu objects
             kids(i) = [];
           otherwise
-            error ("__go_draw_figure__: unknown object class, %s", type);
+            error ("__gnuplot_draw_figure__: unknown object class, %s", type);
         endswitch
       endfor
       if (isempty (kids))
@@ -198,7 +198,7 @@
       fflush (plot_stream);
     endif
   else
-    error ("__go_draw_figure__: expecting figure object, found '%s'",
+    error ("__gnuplot_draw_figure__: expecting figure object, found '%s'",
            htype);
   endif