Skip to content

Improve positioning of rangebreaks #4698

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
archmoj merged 11 commits into from
Mar 28, 2020
Merged

Improve positioning of rangebreaks #4698

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5b450da
refactor to have plus signs
archmoj Mar 27, 2020
d41b153
remove extra variable
archmoj Mar 27, 2020
155c055
remove another extra variable
archmoj Mar 27, 2020
07caa6c
move b0 out
archmoj Mar 27, 2020
25e0356
more b0 isolation
archmoj Mar 27, 2020
088d060
avoid equal - simplify by moving b1 out
archmoj Mar 27, 2020
0359a8e
move step up
archmoj Mar 27, 2020
0d6d798
refactor long lines - move bounds set out of switch
archmoj Mar 27, 2020
b3a9a96
simplify loop - replace while with for
archmoj Mar 27, 2020
4f1f9cf
reuse the loop to add breaks for cases without pattern
archmoj Mar 27, 2020
a4a8f4a
address issue #4697 - avoid rounding errors
archmoj Mar 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
move step up
  • Loading branch information
@archmoj
archmoj committed Mar 27, 2020
commit 0359a8e93a7f8572dc5c343b0a0df2db5483cf30
6 changes: 4 additions & 2 deletions src/plots/cartesian/set_convert.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,10 +737,11 @@ module.exports = function setConvert(ax, fullLayout) {

switch(brk.pattern) {
case WEEKDAY_PATTERN:
step = 7 * ONEDAY;

b0 = bnds[0];
b1 = bnds[1];
bndDelta = (b1 < b0 ? 7 : 0) * ONEDAY + (b1 - b0) * ONEDAY;
step = 7 * ONEDAY;

t = r0 + b0 * ONEDAY - (
r0Date.getUTCDay() * ONEDAY +
Expand All @@ -751,10 +752,11 @@ module.exports = function setConvert(ax, fullLayout) {
);
break;
case HOUR_PATTERN:
step = ONEDAY;

b0 = bnds[0];
b1 = bnds[1];
bndDelta = (b1 < b0 ? 24 : 0) * ONEHOUR + (b1 - b0) * ONEHOUR;
step = ONEDAY;

t = r0 + b0 * ONEHOUR - (
r0Date.getUTCHours() * ONEHOUR +
Expand Down