Mercurial > octave
annotate scripts/plot/appearance/datetick.m @ 19697:4197fc428c7d
maint: Update copyright notices for 2015.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 11 Feb 2015 14:19:08 -0500 |
| parents | 0e1f5a750d00 |
| children | 777f26aa8e3e |
| rev | line source |
|---|---|
|
19697
4197fc428c7d
maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents:
19596
diff
changeset
|
1 ## Copyright (C) 2008-2015 David Bateman |
| 8112 | 2 ## |
| 3 ## This file is part of Octave. | |
| 4 ## | |
| 5 ## Octave is free software; you can redistribute it and/or modify it | |
| 6 ## under the terms of the GNU General Public License as published by | |
| 7 ## the Free Software Foundation; either version 3 of the License, or (at | |
| 8 ## your option) any later version. | |
| 9 ## | |
| 10 ## Octave is distributed in the hope that it will be useful, but | |
| 11 ## WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 13 ## General Public License for more details. | |
| 14 ## | |
| 15 ## You should have received a copy of the GNU General Public License | |
| 16 ## along with Octave; see the file COPYING. If not, see | |
| 17 ## <http://www.gnu.org/licenses/>. | |
| 18 | |
| 19 ## -*- texinfo -*- | |
|
10793
be55736a0783
Grammarcheck the documentation from m-files.
Rik <octave@nomad.inbox5.com>
parents:
10369
diff
changeset
|
20 ## @deftypefn {Function File} {} datetick () |
|
10151
c2f1cdb59821
datetick: make form argument optional
John W. Eaton <jwe@octave.org>
parents:
9245
diff
changeset
|
21 ## @deftypefnx {Function File} {} datetick (@var{form}) |
| 8112 | 22 ## @deftypefnx {Function File} {} datetick (@var{axis}, @var{form}) |
| 23 ## @deftypefnx {Function File} {} datetick (@dots{}, "keeplimits") | |
| 24 ## @deftypefnx {Function File} {} datetick (@dots{}, "keepticks") | |
|
16094
8899c785cc99
doc: Fix warnings associated with Texinfo 5.0 (bug #38392)
Rik <rik@octave.org>
parents:
14846
diff
changeset
|
25 ## @deftypefnx {Function File} {} datetick (@var{hax}, @dots{}) |
|
8899c785cc99
doc: Fix warnings associated with Texinfo 5.0 (bug #38392)
Rik <rik@octave.org>
parents:
14846
diff
changeset
|
26 ## Add date formatted tick labels to an axis. The axis to apply the |
|
17281
bc924baa2c4e
doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents:
17211
diff
changeset
|
27 ## ticks to is determined by @var{axis} which can take the values @qcode{"x"}, |
|
bc924baa2c4e
doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents:
17211
diff
changeset
|
28 ## @qcode{"y"}, or @qcode{"z"}. The default value is @qcode{"x"}. The |
|
bc924baa2c4e
doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents:
17211
diff
changeset
|
29 ## formatting of the labels is determined by the variable @var{form}, which |
|
bc924baa2c4e
doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents:
17211
diff
changeset
|
30 ## can either be a string or positive integer that @code{datestr} accepts. |
| 8112 | 31 ## @seealso{datenum, datestr} |
| 32 ## @end deftypefn | |
| 33 | |
| 34 function datetick (varargin) | |
| 35 | |
|
17210
73dd413f2c3e
datetick.m: Use modern coding conventions in function.
Rik <rik@octave.org>
parents:
16094
diff
changeset
|
36 [hax, varargin, nargin] = __plt_get_axis_arg__ ("datetick", varargin{:}); |
| 8112 | 37 |
|
17211
87ba70043bfc
Don't use ifelse in plot fcns to avoid unnecessary fcn evaluations.
Rik <rik@octave.org>
parents:
17210
diff
changeset
|
38 oldfig = []; |
|
17301
68bcac3c043a
Correct inversion accidentally introduced in cset 87ba70043bfc.
Rik <rik@octave.org>
parents:
17281
diff
changeset
|
39 if (! isempty (hax)) |
|
17211
87ba70043bfc
Don't use ifelse in plot fcns to avoid unnecessary fcn evaluations.
Rik <rik@octave.org>
parents:
17210
diff
changeset
|
40 oldfig = get (0, "currentfigure"); |
|
87ba70043bfc
Don't use ifelse in plot fcns to avoid unnecessary fcn evaluations.
Rik <rik@octave.org>
parents:
17210
diff
changeset
|
41 endif |
|
17210
73dd413f2c3e
datetick.m: Use modern coding conventions in function.
Rik <rik@octave.org>
parents:
16094
diff
changeset
|
42 if (isempty (hax)) |
|
73dd413f2c3e
datetick.m: Use modern coding conventions in function.
Rik <rik@octave.org>
parents:
16094
diff
changeset
|
43 hax = gca (); |
|
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
17744
diff
changeset
|
44 endif |
|
17210
73dd413f2c3e
datetick.m: Use modern coding conventions in function.
Rik <rik@octave.org>
parents:
16094
diff
changeset
|
45 |
|
10151
c2f1cdb59821
datetick: make form argument optional
John W. Eaton <jwe@octave.org>
parents:
9245
diff
changeset
|
46 unwind_protect |
|
17210
73dd413f2c3e
datetick.m: Use modern coding conventions in function.
Rik <rik@octave.org>
parents:
16094
diff
changeset
|
47 ## FIXME: This will bring the axes to the top of the stack. |
|
18348
052cc933aea6
datetick.m: Add more detail to FIXME note.
Rik <rik@octave.org>
parents:
17745
diff
changeset
|
48 ## This may not be desirable if there are multiple axes objects, |
|
052cc933aea6
datetick.m: Add more detail to FIXME note.
Rik <rik@octave.org>
parents:
17745
diff
changeset
|
49 ## such as can occur with plotyy. |
|
17210
73dd413f2c3e
datetick.m: Use modern coding conventions in function.
Rik <rik@octave.org>
parents:
16094
diff
changeset
|
50 axes (hax); |
|
10151
c2f1cdb59821
datetick: make form argument optional
John W. Eaton <jwe@octave.org>
parents:
9245
diff
changeset
|
51 __datetick__ (varargin{:}); |
|
c2f1cdb59821
datetick: make form argument optional
John W. Eaton <jwe@octave.org>
parents:
9245
diff
changeset
|
52 unwind_protect_cleanup |
|
17210
73dd413f2c3e
datetick.m: Use modern coding conventions in function.
Rik <rik@octave.org>
parents:
16094
diff
changeset
|
53 if (! isempty (oldfig)) |
|
73dd413f2c3e
datetick.m: Use modern coding conventions in function.
Rik <rik@octave.org>
parents:
16094
diff
changeset
|
54 set (0, "currentfigure", oldfig); |
|
73dd413f2c3e
datetick.m: Use modern coding conventions in function.
Rik <rik@octave.org>
parents:
16094
diff
changeset
|
55 endif |
|
10151
c2f1cdb59821
datetick: make form argument optional
John W. Eaton <jwe@octave.org>
parents:
9245
diff
changeset
|
56 end_unwind_protect |
|
c2f1cdb59821
datetick: make form argument optional
John W. Eaton <jwe@octave.org>
parents:
9245
diff
changeset
|
57 |
| 8112 | 58 endfunction |
| 59 | |
|
14237
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
60 |
| 8112 | 61 %!demo |
|
14237
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
62 %! clf; |
| 8112 | 63 %! yr = 1900:10:2000; |
| 64 %! pop = [76.094, 92.407, 106.461, 123.077 131.954, 151.868, 179.979, ... | |
| 65 %! 203.984, 227.225, 249.623, 282.224]; | |
| 66 %! plot (datenum (yr, 1, 1), pop); | |
|
18876
cafffc1b70b1
update plot demo blocks for compare_plot_demos
Andreas Weber <andy.weber.aw@gmail.com>
parents:
18348
diff
changeset
|
67 %! title ('US population (millions)'); |
|
cafffc1b70b1
update plot demo blocks for compare_plot_demos
Andreas Weber <andy.weber.aw@gmail.com>
parents:
18348
diff
changeset
|
68 %! xlabel ('Year'); |
|
cafffc1b70b1
update plot demo blocks for compare_plot_demos
Andreas Weber <andy.weber.aw@gmail.com>
parents:
18348
diff
changeset
|
69 %! datetick ('x', 'YYYY'); |
| 8112 | 70 |
|
10369
3516a245d607
datetick.m: Fix 'keepticks' bug, and untabify.
Ben Abbott <bpabbott@mac.com>
parents:
10151
diff
changeset
|
71 %!demo |
|
14237
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
72 %! clf; |
|
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
73 %! yr = 1988:2:2002; |
|
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
74 %! yr = datenum (yr,1,1); |
|
10369
3516a245d607
datetick.m: Fix 'keepticks' bug, and untabify.
Ben Abbott <bpabbott@mac.com>
parents:
10151
diff
changeset
|
75 %! pr = [12.1 13.3 12.6 13.1 13.3 14.1 14.4 15.2]; |
|
18876
cafffc1b70b1
update plot demo blocks for compare_plot_demos
Andreas Weber <andy.weber.aw@gmail.com>
parents:
18348
diff
changeset
|
76 %! plot (yr, pr, '-o'); |
|
cafffc1b70b1
update plot demo blocks for compare_plot_demos
Andreas Weber <andy.weber.aw@gmail.com>
parents:
18348
diff
changeset
|
77 %! xlabel ('year'); |
|
cafffc1b70b1
update plot demo blocks for compare_plot_demos
Andreas Weber <andy.weber.aw@gmail.com>
parents:
18348
diff
changeset
|
78 %! ylabel ('average price'); |
|
14363
f3d52523cde1
Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents:
14237
diff
changeset
|
79 %! ax = gca; |
|
18876
cafffc1b70b1
update plot demo blocks for compare_plot_demos
Andreas Weber <andy.weber.aw@gmail.com>
parents:
18348
diff
changeset
|
80 %! set (ax, 'xtick', datenum (1990:5:2005,1,1)); |
|
18924
9a5e03801d23
Update some plot %!demos so that they run under Matlab.
Rik <rik@octave.org>
parents:
18876
diff
changeset
|
81 %! datetick (2, 'x', 'keepticks'); |
|
18876
cafffc1b70b1
update plot demo blocks for compare_plot_demos
Andreas Weber <andy.weber.aw@gmail.com>
parents:
18348
diff
changeset
|
82 %! set (ax, 'ytick', 12:16); |
|
10369
3516a245d607
datetick.m: Fix 'keepticks' bug, and untabify.
Ben Abbott <bpabbott@mac.com>
parents:
10151
diff
changeset
|
83 |
|
13082
35c0b722d2e4
codesprint: mark datetick as tested.
John W. Eaton <jwe@octave.org>
parents:
12575
diff
changeset
|
84 ## Remove from test statistics. No real tests possible. |
|
35c0b722d2e4
codesprint: mark datetick as tested.
John W. Eaton <jwe@octave.org>
parents:
12575
diff
changeset
|
85 %!assert (1) |
|
35c0b722d2e4
codesprint: mark datetick as tested.
John W. Eaton <jwe@octave.org>
parents:
12575
diff
changeset
|
86 |
| 8112 | 87 function __datetick__ (varargin) |
| 88 | |
| 89 keeplimits = false; | |
|
17210
73dd413f2c3e
datetick.m: Use modern coding conventions in function.
Rik <rik@octave.org>
parents:
16094
diff
changeset
|
90 idx = strcmpi (varargin, "keeplimits"); |
|
73dd413f2c3e
datetick.m: Use modern coding conventions in function.
Rik <rik@octave.org>
parents:
16094
diff
changeset
|
91 if (any (idx)) |
|
73dd413f2c3e
datetick.m: Use modern coding conventions in function.
Rik <rik@octave.org>
parents:
16094
diff
changeset
|
92 keeplimits = true; |
|
73dd413f2c3e
datetick.m: Use modern coding conventions in function.
Rik <rik@octave.org>
parents:
16094
diff
changeset
|
93 varargin = varargin(! idx); |
|
73dd413f2c3e
datetick.m: Use modern coding conventions in function.
Rik <rik@octave.org>
parents:
16094
diff
changeset
|
94 endif |
|
10369
3516a245d607
datetick.m: Fix 'keepticks' bug, and untabify.
Ben Abbott <bpabbott@mac.com>
parents:
10151
diff
changeset
|
95 keepticks = false; |
|
17210
73dd413f2c3e
datetick.m: Use modern coding conventions in function.
Rik <rik@octave.org>
parents:
16094
diff
changeset
|
96 idx = strcmpi (varargin, "keepticks"); |
|
73dd413f2c3e
datetick.m: Use modern coding conventions in function.
Rik <rik@octave.org>
parents:
16094
diff
changeset
|
97 if (any (idx)) |
|
73dd413f2c3e
datetick.m: Use modern coding conventions in function.
Rik <rik@octave.org>
parents:
16094
diff
changeset
|
98 keepticks = true; |
|
73dd413f2c3e
datetick.m: Use modern coding conventions in function.
Rik <rik@octave.org>
parents:
16094
diff
changeset
|
99 varargin = varargin(! idx); |
|
73dd413f2c3e
datetick.m: Use modern coding conventions in function.
Rik <rik@octave.org>
parents:
16094
diff
changeset
|
100 endif |
| 8112 | 101 |
|
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
17744
diff
changeset
|
102 nargin = numel (varargin); |
| 8112 | 103 form = []; |
| 104 ax = "x"; | |
| 105 | |
| 106 if (nargin != 0) | |
| 107 arg = varargin{1}; | |
|
17210
73dd413f2c3e
datetick.m: Use modern coding conventions in function.
Rik <rik@octave.org>
parents:
16094
diff
changeset
|
108 if (ischar (arg) && any (strcmpi (arg, {"x", "y", "z"}))) |
|
73dd413f2c3e
datetick.m: Use modern coding conventions in function.
Rik <rik@octave.org>
parents:
16094
diff
changeset
|
109 ax = tolower (arg); |
| 8112 | 110 if (nargin > 1) |
|
10369
3516a245d607
datetick.m: Fix 'keepticks' bug, and untabify.
Ben Abbott <bpabbott@mac.com>
parents:
10151
diff
changeset
|
111 form = varargin{2}; |
|
3516a245d607
datetick.m: Fix 'keepticks' bug, and untabify.
Ben Abbott <bpabbott@mac.com>
parents:
10151
diff
changeset
|
112 varargin(1:2) = []; |
| 8112 | 113 else |
|
10369
3516a245d607
datetick.m: Fix 'keepticks' bug, and untabify.
Ben Abbott <bpabbott@mac.com>
parents:
10151
diff
changeset
|
114 varargin(1) = []; |
| 8112 | 115 endif |
| 116 else | |
| 117 form = arg; | |
| 118 varargin(1) = []; | |
| 119 endif | |
| 120 endif | |
| 121 | |
| 122 ## Don't publish the existence of this variable for use with dateaxis | |
| 123 if (length (varargin) > 0) | |
| 124 startdate = varargin{1}; | |
| 125 else | |
| 126 startdate = []; | |
| 127 endif | |
| 128 | |
|
10151
c2f1cdb59821
datetick: make form argument optional
John W. Eaton <jwe@octave.org>
parents:
9245
diff
changeset
|
129 if (! isempty (form)) |
|
c2f1cdb59821
datetick: make form argument optional
John W. Eaton <jwe@octave.org>
parents:
9245
diff
changeset
|
130 if (isnumeric (form)) |
|
17210
73dd413f2c3e
datetick.m: Use modern coding conventions in function.
Rik <rik@octave.org>
parents:
16094
diff
changeset
|
131 if (! isscalar (form) || form < 0 || form != fix (form)) |
|
11472
1740012184f9
Use uppercase for variable names in error() strings to match Info documentation. Only m-files done.
Rik <octave@nomad.inbox5.com>
parents:
11294
diff
changeset
|
132 error ("datetick: expecting FORM argument to be a positive integer"); |
|
10151
c2f1cdb59821
datetick: make form argument optional
John W. Eaton <jwe@octave.org>
parents:
9245
diff
changeset
|
133 endif |
|
c2f1cdb59821
datetick: make form argument optional
John W. Eaton <jwe@octave.org>
parents:
9245
diff
changeset
|
134 elseif (! ischar (form)) |
|
c2f1cdb59821
datetick: make form argument optional
John W. Eaton <jwe@octave.org>
parents:
9245
diff
changeset
|
135 error ("datetick: expecting valid date format string"); |
| 8112 | 136 endif |
| 137 endif | |
| 138 | |
|
10369
3516a245d607
datetick.m: Fix 'keepticks' bug, and untabify.
Ben Abbott <bpabbott@mac.com>
parents:
10151
diff
changeset
|
139 if (keepticks) |
|
17210
73dd413f2c3e
datetick.m: Use modern coding conventions in function.
Rik <rik@octave.org>
parents:
16094
diff
changeset
|
140 ticks = get (gca (), [ax "tick"]); |
| 8112 | 141 else |
| 142 ## Need to do our own axis tick position calculation as | |
| 143 ## year, etc, don't fallback on nice datenum values. | |
|
14846
460a3c6d8bf1
maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists.
Rik <octave@nomad.inbox5.com>
parents:
14665
diff
changeset
|
144 objs = findall (gca ()); |
| 8112 | 145 xmax = NaN; |
| 146 xmin = NaN; | |
| 147 for i = 1 : length (objs) | |
| 148 fld = get (objs (i)); | |
|
17210
73dd413f2c3e
datetick.m: Use modern coding conventions in function.
Rik <rik@octave.org>
parents:
16094
diff
changeset
|
149 if (isfield (fld, [ax "data"])) |
|
73dd413f2c3e
datetick.m: Use modern coding conventions in function.
Rik <rik@octave.org>
parents:
16094
diff
changeset
|
150 xdata = getfield (fld, [ax "data"])(:); |
|
10369
3516a245d607
datetick.m: Fix 'keepticks' bug, and untabify.
Ben Abbott <bpabbott@mac.com>
parents:
10151
diff
changeset
|
151 xmin = min (xmin, min (xdata)); |
|
3516a245d607
datetick.m: Fix 'keepticks' bug, and untabify.
Ben Abbott <bpabbott@mac.com>
parents:
10151
diff
changeset
|
152 xmax = max (xmax, max (xdata)); |
| 8112 | 153 endif |
| 154 endfor | |
| 155 | |
| 156 if (isnan (xmin) || isnan (xmax)) | |
| 157 xmin = 0; | |
| 158 xmax = 1; | |
| 159 elseif (xmin == xmax) | |
| 160 xmax = xmin + 1; | |
| 161 endif | |
| 162 | |
| 163 N = 3; | |
| 164 if (xmax - xmin < N) | |
| 165 ## Day scale or less | |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
166 if (xmax - xmin < N / 24 / 60 / 60) |
|
10369
3516a245d607
datetick.m: Fix 'keepticks' bug, and untabify.
Ben Abbott <bpabbott@mac.com>
parents:
10151
diff
changeset
|
167 scl = 1 / 24 / 60 / 60; |
|
14665
4f458e882516
Allow fractional months to datenum and correct a couple of typos in datetick (bug #36482)
David Bateman <dbateman@free.fr>
parents:
14552
diff
changeset
|
168 elseif (xmax - xmin < N / 24 / 60) |
|
10369
3516a245d607
datetick.m: Fix 'keepticks' bug, and untabify.
Ben Abbott <bpabbott@mac.com>
parents:
10151
diff
changeset
|
169 scl = 1 / 24 / 60; |
| 8112 | 170 else |
|
10369
3516a245d607
datetick.m: Fix 'keepticks' bug, and untabify.
Ben Abbott <bpabbott@mac.com>
parents:
10151
diff
changeset
|
171 scl = 1 / 24; |
| 8112 | 172 endif |
| 173 sep = __calc_tick_sep__ (xmin / scl , xmax / scl); | |
| 174 xmin = sep * floor (xmin / scl / sep); | |
| 175 xmax = sep * ceil (xmax / scl / sep); | |
| 176 nticks = (xmax - xmin) / sep + 1; | |
| 177 xmin *= scl; | |
| 178 xmax *= scl; | |
| 179 else | |
| 180 [ymin, mmin, dmin] = datevec (xmin); | |
| 181 [ymax, mmax, dmax] = datevec (xmax); | |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
182 minyear = ymin + (mmin - 1) / 12 + (dmin - 1) / 12 / 30; |
|
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
183 maxyear = ymax + (mmax - 1) / 12 + (dmax - 1) / 12 / 30; |
|
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
184 minmonth = mmin + (dmin - 1) / 30; |
|
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
185 maxmonth = (ymax - ymin) * 12 + mmax + (dmax - 1) / 30; |
| 8112 | 186 |
| 187 if (maxmonth - minmonth < N) | |
|
10369
3516a245d607
datetick.m: Fix 'keepticks' bug, and untabify.
Ben Abbott <bpabbott@mac.com>
parents:
10151
diff
changeset
|
188 sep = __calc_tick_sep__ (xmin, xmax); |
|
3516a245d607
datetick.m: Fix 'keepticks' bug, and untabify.
Ben Abbott <bpabbott@mac.com>
parents:
10151
diff
changeset
|
189 xmin = sep * floor (xmin / sep); |
|
3516a245d607
datetick.m: Fix 'keepticks' bug, and untabify.
Ben Abbott <bpabbott@mac.com>
parents:
10151
diff
changeset
|
190 xmax = sep * ceil (xmax / sep); |
|
3516a245d607
datetick.m: Fix 'keepticks' bug, and untabify.
Ben Abbott <bpabbott@mac.com>
parents:
10151
diff
changeset
|
191 nticks = (xmax - xmin) / sep + 1; |
| 8112 | 192 elseif (maxyear - minyear < N) |
|
10369
3516a245d607
datetick.m: Fix 'keepticks' bug, and untabify.
Ben Abbott <bpabbott@mac.com>
parents:
10151
diff
changeset
|
193 sep = __calc_tick_sep__ (minmonth , maxmonth); |
|
3516a245d607
datetick.m: Fix 'keepticks' bug, and untabify.
Ben Abbott <bpabbott@mac.com>
parents:
10151
diff
changeset
|
194 xmin = datenum (ymin, sep * floor (minmonth / sep), 1); |
|
14665
4f458e882516
Allow fractional months to datenum and correct a couple of typos in datetick (bug #36482)
David Bateman <dbateman@free.fr>
parents:
14552
diff
changeset
|
195 xmax = datenum (ymax, sep * ceil (maxmonth / sep), 1); |
|
10369
3516a245d607
datetick.m: Fix 'keepticks' bug, and untabify.
Ben Abbott <bpabbott@mac.com>
parents:
10151
diff
changeset
|
196 nticks = ceil (maxmonth / sep) - floor (minmonth / sep) + 1; |
| 8112 | 197 else |
|
10369
3516a245d607
datetick.m: Fix 'keepticks' bug, and untabify.
Ben Abbott <bpabbott@mac.com>
parents:
10151
diff
changeset
|
198 sep = __calc_tick_sep__ (minyear , maxyear); |
|
3516a245d607
datetick.m: Fix 'keepticks' bug, and untabify.
Ben Abbott <bpabbott@mac.com>
parents:
10151
diff
changeset
|
199 xmin = datenum (sep * floor (minyear / sep), 1, 1); |
|
3516a245d607
datetick.m: Fix 'keepticks' bug, and untabify.
Ben Abbott <bpabbott@mac.com>
parents:
10151
diff
changeset
|
200 xmax = datenum (sep * ceil (maxyear / sep), 1, 1); |
|
3516a245d607
datetick.m: Fix 'keepticks' bug, and untabify.
Ben Abbott <bpabbott@mac.com>
parents:
10151
diff
changeset
|
201 nticks = ceil (maxyear / sep) - floor (minyear / sep) + 1; |
| 8112 | 202 endif |
| 203 endif | |
| 204 ticks = xmin + [0 : nticks - 1] / (nticks - 1) * (xmax - xmin); | |
| 205 endif | |
| 206 | |
| 207 if (isempty (form)) | |
|
14552
86854d032a37
maint: miscellaneous style fixes for .m files
John W. Eaton <jwe@octave.org>
parents:
14363
diff
changeset
|
208 r = max (ticks) - min (ticks); |
|
86854d032a37
maint: miscellaneous style fixes for .m files
John W. Eaton <jwe@octave.org>
parents:
14363
diff
changeset
|
209 if (r < 10/60/24) |
| 8112 | 210 ## minutes and seconds |
| 211 form = 13; | |
|
14552
86854d032a37
maint: miscellaneous style fixes for .m files
John W. Eaton <jwe@octave.org>
parents:
14363
diff
changeset
|
212 elseif (r < 2) |
| 8112 | 213 ## hours |
| 214 form = 15; | |
|
14552
86854d032a37
maint: miscellaneous style fixes for .m files
John W. Eaton <jwe@octave.org>
parents:
14363
diff
changeset
|
215 elseif (r < 15) |
| 8112 | 216 ## days |
| 217 form = 8; | |
|
14552
86854d032a37
maint: miscellaneous style fixes for .m files
John W. Eaton <jwe@octave.org>
parents:
14363
diff
changeset
|
218 elseif (r < 365) |
|
17210
73dd413f2c3e
datetick.m: Use modern coding conventions in function.
Rik <rik@octave.org>
parents:
16094
diff
changeset
|
219 ## FIXME: FORM should be 19 for European users who use dd/mm |
|
10151
c2f1cdb59821
datetick: make form argument optional
John W. Eaton <jwe@octave.org>
parents:
9245
diff
changeset
|
220 ## instead of mm/dd. How can that be determined automatically? |
| 8112 | 221 ## months |
| 222 form = 6; | |
|
14552
86854d032a37
maint: miscellaneous style fixes for .m files
John W. Eaton <jwe@octave.org>
parents:
14363
diff
changeset
|
223 elseif (r < 90*12) |
| 8112 | 224 ## quarters |
| 225 form = 27; | |
| 226 else | |
| 227 ## years | |
| 228 form = 10; | |
| 229 endif | |
| 230 endif | |
| 231 | |
| 232 if (length (ticks) == 6) | |
| 233 ## Careful that its not treated as a datevec | |
| 234 if (! isempty (startdate)) | |
| 235 sticks = strvcat (datestr (ticks(1:end-1) - ticks(1) + startdate, form), | |
|
10369
3516a245d607
datetick.m: Fix 'keepticks' bug, and untabify.
Ben Abbott <bpabbott@mac.com>
parents:
10151
diff
changeset
|
236 datestr (ticks(end) - ticks(1) + startdate, form)); |
| 8112 | 237 else |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
238 sticks = strvcat (datestr (ticks(1:end-1), form), |
|
10369
3516a245d607
datetick.m: Fix 'keepticks' bug, and untabify.
Ben Abbott <bpabbott@mac.com>
parents:
10151
diff
changeset
|
239 datestr (ticks(end), form)); |
| 8112 | 240 endif |
| 241 else | |
| 242 if (! isempty (startdate)) | |
| 243 sticks = datestr (ticks - ticks(1) + startdate, form); | |
| 244 else | |
| 245 sticks = datestr (ticks, form); | |
| 246 endif | |
| 247 endif | |
| 248 | |
| 249 sticks = mat2cell (sticks, ones (rows (sticks), 1), columns (sticks)); | |
| 250 | |
|
10369
3516a245d607
datetick.m: Fix 'keepticks' bug, and untabify.
Ben Abbott <bpabbott@mac.com>
parents:
10151
diff
changeset
|
251 if (keepticks) |
| 8112 | 252 if (keeplimits) |
|
17210
73dd413f2c3e
datetick.m: Use modern coding conventions in function.
Rik <rik@octave.org>
parents:
16094
diff
changeset
|
253 set (gca (), [ax "ticklabel"], sticks); |
| 8112 | 254 else |
|
17210
73dd413f2c3e
datetick.m: Use modern coding conventions in function.
Rik <rik@octave.org>
parents:
16094
diff
changeset
|
255 set (gca (), [ax "ticklabel"], sticks, |
|
73dd413f2c3e
datetick.m: Use modern coding conventions in function.
Rik <rik@octave.org>
parents:
16094
diff
changeset
|
256 [ax "lim"], [min(ticks), max(ticks)]); |
| 8112 | 257 endif |
| 258 else | |
| 259 if (keeplimits) | |
|
17210
73dd413f2c3e
datetick.m: Use modern coding conventions in function.
Rik <rik@octave.org>
parents:
16094
diff
changeset
|
260 set (gca (), [ax "tick"], ticks, [ax "ticklabel"], sticks); |
| 8112 | 261 else |
|
17210
73dd413f2c3e
datetick.m: Use modern coding conventions in function.
Rik <rik@octave.org>
parents:
16094
diff
changeset
|
262 set (gca (), [ax "tick"], ticks, [ax "ticklabel"], sticks, |
|
73dd413f2c3e
datetick.m: Use modern coding conventions in function.
Rik <rik@octave.org>
parents:
16094
diff
changeset
|
263 [ax "lim"], [min(ticks), max(ticks)]); |
| 8112 | 264 endif |
| 265 endif | |
| 266 endfunction | |
| 267 | |
| 268 function [a, b] = __magform__ (x) | |
| 269 if (x == 0) | |
| 270 a = 0; | |
| 271 b = 0; | |
| 272 else | |
| 273 l = log10 (abs (x)); | |
| 19118 | 274 r = rem (l, 1); |
| 8112 | 275 a = 10 .^ r; |
| 276 b = fix (l - r); | |
| 277 if (a < 1) | |
| 278 a *= 10; | |
| 279 b -= 1; | |
| 280 endif | |
| 281 if (x < 0) | |
| 282 a = -a; | |
| 283 endif | |
| 284 endif | |
| 285 endfunction | |
| 286 | |
| 287 ## A translation from Tom Holoryd's python code at | |
| 288 ## http://kurage.nimh.nih.gov/tomh/tics.py | |
| 289 function sep = __calc_tick_sep__ (lo, hi) | |
| 290 persistent sqrt_2 = sqrt (2.0); | |
| 291 persistent sqrt_10 = sqrt (10.0); | |
| 292 persistent sqrt_50 = sqrt (50.0); | |
| 293 | |
| 294 ticint = 5; | |
| 295 | |
| 296 ## Reference: Lewart, C. R., "Algorithms SCALE1, SCALE2, and | |
| 297 ## SCALE3 for Determination of Scales on Computer Generated | |
| 298 ## Plots", Communications of the ACM, 10 (1973), 639-640. | |
| 299 ## Also cited as ACM Algorithm 463. | |
| 300 | |
| 301 [a, b] = __magform__ ((hi - lo) / ticint); | |
| 302 | |
| 303 if (a < sqrt_2) | |
| 304 x = 1; | |
| 305 elseif (a < sqrt_10) | |
| 306 x = 2; | |
| 307 elseif (a < sqrt_50) | |
| 308 x = 5; | |
| 309 else | |
| 310 x = 10; | |
| 311 endif | |
| 312 sep = x * 10 .^ b; | |
| 313 endfunction | |
| 314 |