Mercurial > octave

changeset 22623:76f1164d2135

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename [xyz]mtick properties to [xyz]minortickvalues (bug #49205). * gl-render.cc: Search and replace get_[xyz]mtick -> get_[xyz]minortickvalues. * graphics.in.h: Search and replace [xyz]mtick -> [xyz]minortickvalues. * annotation.m: Replace "axesmtick" with "axesxminortickvalues" in call to addproperty.
author Rik <rik@octave.org>
date Fri, 14 Oct 2016 15:42:08 -0700
parents 4191f8b5070c
children 4bd7bab38f39
files libinterp/corefcn/gl-render.cc libinterp/corefcn/graphics.in.h scripts/plot/appearance/annotation.m
diffstat 3 files changed, 19 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/gl-render.cc	Fri Oct 14 14:46:25 2016 -0700
+++ b/libinterp/corefcn/gl-render.cc	Fri Oct 14 15:42:08 2016 -0700
@@ -1376,7 +1376,7 @@
                               && (minorgridstyle != "none"));
         bool do_xminortick = props.is_xminortick ();
         Matrix xticks = xform.xscale (props.get_xtick ().matrix_value ());
-        Matrix xmticks = xform.xscale (props.get_xmtick ().matrix_value ());
+        Matrix xmticks = xform.xscale (props.get_xminortickvalues ().matrix_value ());
         string_vector xticklabels = props.get_xticklabel ().string_vector_value ();
         int wmax = 0;
         int hmax = 0;
@@ -1513,7 +1513,7 @@
                               && (minorgridstyle != "none"));
         bool do_yminortick = props.is_yminortick ();
         Matrix yticks = xform.yscale (props.get_ytick ().matrix_value ());
-        Matrix ymticks = xform.yscale (props.get_ymtick ().matrix_value ());
+        Matrix ymticks = xform.yscale (props.get_yminortickvalues ().matrix_value ());
         string_vector yticklabels = props.get_yticklabel ().string_vector_value ();
         int wmax = 0;
         int hmax = 0;
@@ -1641,7 +1641,7 @@
                               && (minorgridstyle != "none"));
         bool do_zminortick = props.is_zminortick ();
         Matrix zticks = xform.zscale (props.get_ztick ().matrix_value ());
-        Matrix zmticks = xform.zscale (props.get_zmtick ().matrix_value ());
+        Matrix zmticks = xform.zscale (props.get_zminortickvalues ().matrix_value ());
         string_vector zticklabels = props.get_zticklabel ().string_vector_value ();
         int wmax = 0;
         int hmax = 0;
--- a/libinterp/corefcn/graphics.in.h	Fri Oct 14 14:46:25 2016 -0700
+++ b/libinterp/corefcn/graphics.in.h	Fri Oct 14 15:42:08 2016 -0700
@@ -3937,9 +3937,9 @@
       array_property x_normrendertransform h , Matrix (4, 4, 0.0)
       array_property x_rendertransform h , Matrix (4, 4, 0.0)
       // hidden properties for minor ticks
-      row_vector_property xmtick h , Matrix ()
-      row_vector_property ymtick h , Matrix ()
-      row_vector_property zmtick h , Matrix ()
+      row_vector_property xminortickvalues h , Matrix ()
+      row_vector_property yminortickvalues h , Matrix ()
+      row_vector_property zminortickvalues h , Matrix ()
       // hidden property for text rendering
       double_property __fontsize_points__ hgr , 0
    END_PROPERTIES
@@ -4036,8 +4036,8 @@
     {
       if (xtickmode.is ("auto"))
         {
-          calc_ticks_and_lims (xlim, xtick, xmtick, xlimmode.is ("auto"),
-                               xscale.is ("log"));
+          calc_ticks_and_lims (xlim, xtick, xminortickvalues,
+                               xlimmode.is ("auto"), xscale.is ("log"));
           update_xtick ();
         }
     }
@@ -4045,8 +4045,8 @@
     {
       if (ytickmode.is ("auto"))
         {
-          calc_ticks_and_lims (ylim, ytick, ymtick, ylimmode.is ("auto"),
-                               yscale.is ("log"));
+          calc_ticks_and_lims (ylim, ytick, yminortickvalues,
+                               ylimmode.is ("auto"), yscale.is ("log"));
           update_ytick ();
         }
     }
@@ -4054,8 +4054,8 @@
     {
       if (ztickmode.is ("auto"))
         {
-          calc_ticks_and_lims (zlim, ztick, zmtick, zlimmode.is ("auto"),
-                               zscale.is ("log"));
+          calc_ticks_and_lims (zlim, ztick, zminortickvalues,
+                               zlimmode.is ("auto"), zscale.is ("log"));
           update_ztick ();
         }
     }
@@ -4218,8 +4218,8 @@
     void update_xlim ()
     {
       if (xtickmode.is ("auto"))
-        calc_ticks_and_lims (xlim, xtick, xmtick, xlimmode.is ("auto"),
-                             xscale.is ("log"));
+        calc_ticks_and_lims (xlim, xtick, xminortickvalues,
+                             xlimmode.is ("auto"), xscale.is ("log"));
       if (xticklabelmode.is ("auto"))
         calc_ticklabels (xtick, xticklabel, xscale.is ("log"));
 
@@ -4233,8 +4233,8 @@
     void update_ylim (void)
     {
       if (ytickmode.is ("auto"))
-        calc_ticks_and_lims (ylim, ytick, ymtick, ylimmode.is ("auto"),
-                             yscale.is ("log"));
+        calc_ticks_and_lims (ylim, ytick, yminortickvalues,
+                             ylimmode.is ("auto"), yscale.is ("log"));
       if (yticklabelmode.is ("auto"))
         calc_ticklabels (ytick, yticklabel, yscale.is ("log"));
 
@@ -4248,8 +4248,8 @@
     void update_zlim (void)
     {
       if (ztickmode.is ("auto"))
-        calc_ticks_and_lims (zlim, ztick, zmtick, zlimmode.is ("auto"),
-                             zscale.is ("log"));
+        calc_ticks_and_lims (zlim, ztick, zminortickvalues,
+                             zlimmode.is ("auto"), zscale.is ("log"));
       if (zticklabelmode.is ("auto"))
         calc_ticklabels (ztick, zticklabel, zscale.is ("log"));
 
--- a/scripts/plot/appearance/annotation.m	Fri Oct 14 14:46:25 2016 -0700
+++ b/scripts/plot/appearance/annotation.m	Fri Oct 14 15:42:08 2016 -0700
@@ -268,7 +268,7 @@
 
   ## hidden property to store figure size in absolute (points)
   ## coordinates
-  addproperty ("figsize_points", hax, "axesxmtick", []);
+  addproperty ("figsize_points", hax, "axesxminortickvalues", []);
   update_figsize_points (hf, {}, hax);