Skip to content

Relocate first tick when falls inside a rangebreak#4734

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

Closed
archmoj wants to merge 4 commits into from
Closed

Relocate first tick when falls inside a rangebreak #4734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4137a12
centralize & refactor range expansions
archmoj Apr 6, 2020
088251d
move first tick if falls inside a break - add and update tests
archmoj Apr 6, 2020
b84eacf
reverse the loop so that undefined tick0 replace with start of the br…
archmoj Apr 6, 2020
f12ffd8
treat reversed ranges the same
archmoj Apr 6, 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
34 changes: 27 additions & 7 deletions src/plots/cartesian/axes.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,15 @@ var autorange = require('./autorange');
axes.getAutoRange = autorange.getAutoRange;
axes.findExtremes = autorange.findExtremes;

var epsilon = 0.0001;
function expandRange(range) {
var delta = (range[1] - range[0]) * epsilon;
return [
range[0] - delta,
range[1] + delta
];
}

/*
* find the list of possible axes to reference with an xref or yref attribute
* and coerce it to that list
Expand DownExpand Up@@ -566,8 +575,9 @@ axes.calcTicks = function calcTicks(ax) {
ax._tmin = axes.tickFirst(ax);

// add a tiny bit so we get ticks which may have rounded out
var startTick = rng[0] * 1.0001 - rng[1] * 0.0001;
var endTick = rng[1] * 1.0001 - rng[0] * 0.0001;
var exRng = expandRange(rng);
var startTick = exRng[0];
var endTick = exRng[1];
// check for reversed axis
var axrev = (rng[1] < rng[0]);

Expand DownExpand Up@@ -691,10 +701,9 @@ function arrayTicks(ax) {
var text = ax.ticktext;
var ticksOut = new Array(vals.length);
var rng = Lib.simpleMap(ax.range, ax.r2l);
var r0expanded = rng[0] * 1.0001 - rng[1] * 0.0001;
var r1expanded = rng[1] * 1.0001 - rng[0] * 0.0001;
var tickMin = Math.min(r0expanded, r1expanded);
var tickMax = Math.max(r0expanded, r1expanded);
var exRng = expandRange(rng);
var tickMin = Math.min(exRng[0], exRng[1]);
var tickMax = Math.max(exRng[0], exRng[1]);
var j = 0;

// without a text array, just format the given values as any other ticks
Expand DownExpand Up@@ -956,10 +965,21 @@ axes.tickFirst = function(ax) {
var sRound = axrev ? Math.floor : Math.ceil;
// add a tiny extra bit to make sure we get ticks
// that may have been rounded out
var r0 = rng[0] * 1.0001 - rng[1] * 0.0001;
var r0 = expandRange(rng)[0];
var dtick = ax.dtick;
var tick0 = r2l(ax.tick0);

if(ax.rangebreaks && ax.maskBreaks(tick0) === BADNUM) {
// attempt move tick0 outside rangebreak
for(var h = 24; h > 0; h--) {
var delta = h * ONEHOUR;
if(ax.maskBreaks(tick0 - delta) !== BADNUM) {
tick0 -= delta;
break;
}
}
}

if(isNumeric(dtick)) {
var tmin = sRound((r0 - tick0) / dtick) * dtick + tick0;

Expand Down
Binary file modifiedtest/image/baselines/axes_breaks-gridlines.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/axes_breaks-night_autorange-reversed.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/axes_breaks-rangeslider.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedtest/image/baselines/axes_breaks-tick0-position.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/axes_breaks-weekends-weeknights.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
218 changes: 218 additions & 0 deletions test/image/mocks/axes_breaks-tick0-position.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,218 @@
{
"data": [
{
"type": "scatter",
"mode": "markers",
"x": [
"1970-01-01T09:00:00",
"1970-01-01T10:00:00",
"1970-01-01T11:00:00",
"1970-01-01T12:00:00",
"1970-01-01T13:00:00",
"1970-01-01T14:00:00",
"1970-01-01T15:00:00",
"1970-01-01T16:00:00",
"1970-01-02T09:00:00",
"1970-01-02T10:00:00",
"1970-01-02T11:00:00",
"1970-01-02T12:00:00",
"1970-01-02T13:00:00",
"1970-01-02T14:00:00",
"1970-01-02T15:00:00",
"1970-01-02T16:00:00",
"1970-01-03T09:00:00",
"1970-01-03T10:00:00",
"1970-01-03T11:00:00",
"1970-01-03T12:00:00",
"1970-01-03T13:00:00",
"1970-01-03T14:00:00",
"1970-01-03T15:00:00",
"1970-01-03T16:00:00",
"1970-01-04T09:00:00",
"1970-01-04T10:00:00",
"1970-01-04T11:00:00",
"1970-01-04T12:00:00",
"1970-01-04T13:00:00",
"1970-01-04T14:00:00",
"1970-01-04T15:00:00",
"1970-01-04T16:00:00",
"1970-01-05T09:00:00",
"1970-01-05T10:00:00",
"1970-01-05T11:00:00",
"1970-01-05T12:00:00",
"1970-01-05T13:00:00",
"1970-01-05T14:00:00",
"1970-01-05T15:00:00",
"1970-01-05T16:00:00"
],
"y": [
1,
2,
3,
4,
5,
6,
7,
8,
9,
10,
11,
12,
13,
14,
15,
16,
17,
18,
19,
20,
21,
22,
23,
24,
25,
26,
27,
28,
29,
30,
31,
32,
33,
34,
35,
36,
37,
38,
39,
40
]
},
{
"type": "scatter",
"mode": "markers",
"x": [
"1970-01-01T09:00:00",
"1970-01-01T10:00:00",
"1970-01-01T11:00:00",
"1970-01-01T12:00:00",
"1970-01-01T13:00:00",
"1970-01-01T14:00:00",
"1970-01-01T15:00:00",
"1970-01-01T16:00:00",
"1970-01-02T09:00:00",
"1970-01-02T10:00:00",
"1970-01-02T11:00:00",
"1970-01-02T12:00:00",
"1970-01-02T13:00:00",
"1970-01-02T14:00:00",
"1970-01-02T15:00:00",
"1970-01-02T16:00:00",
"1970-01-03T09:00:00",
"1970-01-03T10:00:00",
"1970-01-03T11:00:00",
"1970-01-03T12:00:00",
"1970-01-03T13:00:00",
"1970-01-03T14:00:00",
"1970-01-03T15:00:00",
"1970-01-03T16:00:00",
"1970-01-04T09:00:00",
"1970-01-04T10:00:00",
"1970-01-04T11:00:00",
"1970-01-04T12:00:00",
"1970-01-04T13:00:00",
"1970-01-04T14:00:00",
"1970-01-04T15:00:00",
"1970-01-04T16:00:00",
"1970-01-05T09:00:00",
"1970-01-05T10:00:00",
"1970-01-05T11:00:00",
"1970-01-05T12:00:00",
"1970-01-05T13:00:00",
"1970-01-05T14:00:00",
"1970-01-05T15:00:00",
"1970-01-05T16:00:00"
],
"y": [
1,
2,
3,
4,
5,
6,
7,
8,
9,
10,
11,
12,
13,
14,
15,
16,
17,
18,
19,
20,
21,
22,
23,
24,
25,
26,
27,
28,
29,
30,
31,
32,
33,
34,
35,
36,
37,
38,
39,
40
],
"xaxis": "x2",
"yaxis": "y2"
}
],
"layout": {
"width": 800,
"height": 400,
"showlegend": false,
"xaxis": {
"domain": [0, 0.45],
"dtick": 86400000,
"rangebreaks": [
{
"bounds": [
17,
9
],
"pattern": "hour"
}
]
},
"xaxis2": {
"domain": [0.55, 1],
"dtick": 86400000,
"rangebreaks": [
{
"bounds": [
17,
9
],
"pattern": "hour"
}
],
"autorange": "reversed",
"anchor": "y2"
},
"yaxis2": {
"anchor": "x2"
}
}
}
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Relocate first tick when falls inside a rangebreak by archmoj · Pull Request #4734 · plotly/plotly.js · GitHub
Skip to content
Relocate first tick when falls inside a rangebreak#4734

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

 Closed

archmoj
wants to merge
4
commits into

from

 Closed


Relocate first tick when falls inside a rangebreak
#4734
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
4137a12

centralize & refactor range expansions


archmoj Apr 6, 2020
088251d

move first tick if falls inside a break - add and update tests


archmoj Apr 6, 2020
b84eacf

reverse the loop so that undefined tick0 replace with start of the br…


archmoj Apr 6, 2020
f12ffd8

treat reversed ranges the same


archmoj Apr 6, 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


34 changes: 27 additions & 7 deletions
src/plots/cartesian/axes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,15 @@ var autorange = require('./autorange');
axes.getAutoRange = autorange.getAutoRange;
axes.findExtremes = autorange.findExtremes;

var epsilon = 0.0001;
function expandRange(range) {
 var delta = (range[1] - range[0]) * epsilon;
 return [
 range[0] - delta,
 range[1] + delta
 ];
}

/*
 * find the list of possible axes to reference with an xref or yref attribute
 * and coerce it to that list
Expand DownExpand Up@@ -566,8 +575,9 @@ axes.calcTicks = function calcTicks(ax) {
 ax._tmin = axes.tickFirst(ax);

 // add a tiny bit so we get ticks which may have rounded out
 var startTick = rng[0] * 1.0001 - rng[1] * 0.0001;
 var endTick = rng[1] * 1.0001 - rng[0] * 0.0001;
 var exRng = expandRange(rng);
 var startTick = exRng[0];
 var endTick = exRng[1];
 // check for reversed axis
 var axrev = (rng[1] < rng[0]);

Expand DownExpand Up@@ -691,10 +701,9 @@ function arrayTicks(ax) {
 var text = ax.ticktext;
 var ticksOut = new Array(vals.length);
 var rng = Lib.simpleMap(ax.range, ax.r2l);
 var r0expanded = rng[0] * 1.0001 - rng[1] * 0.0001;
 var r1expanded = rng[1] * 1.0001 - rng[0] * 0.0001;
 var tickMin = Math.min(r0expanded, r1expanded);
 var tickMax = Math.max(r0expanded, r1expanded);
 var exRng = expandRange(rng);
 var tickMin = Math.min(exRng[0], exRng[1]);
 var tickMax = Math.max(exRng[0], exRng[1]);
 var j = 0;

 // without a text array, just format the given values as any other ticks
Expand DownExpand Up@@ -956,10 +965,21 @@ axes.tickFirst = function(ax) {
 var sRound = axrev ? Math.floor : Math.ceil;
 // add a tiny extra bit to make sure we get ticks
 // that may have been rounded out
 var r0 = rng[0] * 1.0001 - rng[1] * 0.0001;
 var r0 = expandRange(rng)[0];
 var dtick = ax.dtick;
 var tick0 = r2l(ax.tick0);

 if(ax.rangebreaks && ax.maskBreaks(tick0) === BADNUM) {
 // attempt move tick0 outside rangebreak
 for(var h = 24; h > 0; h--) {
 var delta = h * ONEHOUR;
 if(ax.maskBreaks(tick0 - delta) !== BADNUM) {
 tick0 -= delta;
 break;
 }
 }
 }

 if(isNumeric(dtick)) {
 var tmin = sRound((r0 - tick0) / dtick) * dtick + tick0;

Expand Down
Binary file modifiedtest/image/baselines/axes_breaks-gridlines.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/axes_breaks-night_autorange-reversed.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/axes_breaks-rangeslider.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedtest/image/baselines/axes_breaks-tick0-position.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/axes_breaks-weekends-weeknights.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

218 changes: 218 additions & 0 deletions
test/image/mocks/axes_breaks-tick0-position.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,218 @@
{
 "data": [
 {
 "type": "scatter",
 "mode": "markers",
 "x": [
 "1970-01-01T09:00:00",
 "1970-01-01T10:00:00",
 "1970-01-01T11:00:00",
 "1970-01-01T12:00:00",
 "1970-01-01T13:00:00",
 "1970-01-01T14:00:00",
 "1970-01-01T15:00:00",
 "1970-01-01T16:00:00",
 "1970-01-02T09:00:00",
 "1970-01-02T10:00:00",
 "1970-01-02T11:00:00",
 "1970-01-02T12:00:00",
 "1970-01-02T13:00:00",
 "1970-01-02T14:00:00",
 "1970-01-02T15:00:00",
 "1970-01-02T16:00:00",
 "1970-01-03T09:00:00",
 "1970-01-03T10:00:00",
 "1970-01-03T11:00:00",
 "1970-01-03T12:00:00",
 "1970-01-03T13:00:00",
 "1970-01-03T14:00:00",
 "1970-01-03T15:00:00",
 "1970-01-03T16:00:00",
 "1970-01-04T09:00:00",
 "1970-01-04T10:00:00",
 "1970-01-04T11:00:00",
 "1970-01-04T12:00:00",
 "1970-01-04T13:00:00",
 "1970-01-04T14:00:00",
 "1970-01-04T15:00:00",
 "1970-01-04T16:00:00",
 "1970-01-05T09:00:00",
 "1970-01-05T10:00:00",
 "1970-01-05T11:00:00",
 "1970-01-05T12:00:00",
 "1970-01-05T13:00:00",
 "1970-01-05T14:00:00",
 "1970-01-05T15:00:00",
 "1970-01-05T16:00:00"
 ],
 "y": [
 1,
 2,
 3,
 4,
 5,
 6,
 7,
 8,
 9,
 10,
 11,
 12,
 13,
 14,
 15,
 16,
 17,
 18,
 19,
 20,
 21,
 22,
 23,
 24,
 25,
 26,
 27,
 28,
 29,
 30,
 31,
 32,
 33,
 34,
 35,
 36,
 37,
 38,
 39,
 40
 ]
 },
 {
 "type": "scatter",
 "mode": "markers",
 "x": [
 "1970-01-01T09:00:00",
 "1970-01-01T10:00:00",
 "1970-01-01T11:00:00",
 "1970-01-01T12:00:00",
 "1970-01-01T13:00:00",
 "1970-01-01T14:00:00",
 "1970-01-01T15:00:00",
 "1970-01-01T16:00:00",
 "1970-01-02T09:00:00",
 "1970-01-02T10:00:00",
 "1970-01-02T11:00:00",
 "1970-01-02T12:00:00",
 "1970-01-02T13:00:00",
 "1970-01-02T14:00:00",
 "1970-01-02T15:00:00",
 "1970-01-02T16:00:00",
 "1970-01-03T09:00:00",
 "1970-01-03T10:00:00",
 "1970-01-03T11:00:00",
 "1970-01-03T12:00:00",
 "1970-01-03T13:00:00",
 "1970-01-03T14:00:00",
 "1970-01-03T15:00:00",
 "1970-01-03T16:00:00",
 "1970-01-04T09:00:00",
 "1970-01-04T10:00:00",
 "1970-01-04T11:00:00",
 "1970-01-04T12:00:00",
 "1970-01-04T13:00:00",
 "1970-01-04T14:00:00",
 "1970-01-04T15:00:00",
 "1970-01-04T16:00:00",
 "1970-01-05T09:00:00",
 "1970-01-05T10:00:00",
 "1970-01-05T11:00:00",
 "1970-01-05T12:00:00",
 "1970-01-05T13:00:00",
 "1970-01-05T14:00:00",
 "1970-01-05T15:00:00",
 "1970-01-05T16:00:00"
 ],
 "y": [
 1,
 2,
 3,
 4,
 5,
 6,
 7,
 8,
 9,
 10,
 11,
 12,
 13,
 14,
 15,
 16,
 17,
 18,
 19,
 20,
 21,
 22,
 23,
 24,
 25,
 26,
 27,
 28,
 29,
 30,
 31,
 32,
 33,
 34,
 35,
 36,
 37,
 38,
 39,
 40
 ],
 "xaxis": "x2",
 "yaxis": "y2"
 }
 ],
 "layout": {
 "width": 800,
 "height": 400,
 "showlegend": false,
 "xaxis": {
 "domain": [0, 0.45],
 "dtick": 86400000,
 "rangebreaks": [
 {
 "bounds": [
 17,
 9
 ],
 "pattern": "hour"
 }
 ]
 },
 "xaxis2": {
 "domain": [0.55, 1],
 "dtick": 86400000,
 "rangebreaks": [
 {
 "bounds": [
 17,
 9
 ],
 "pattern": "hour"
 }
 ],
 "autorange": "reversed",
 "anchor": "y2"
 },
 "yaxis2": {
 "anchor": "x2"
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Relocate first tick when falls inside a rangebreak by archmoj · Pull Request #4734 · plotly/plotly.js · GitHub
Skip to content
Relocate first tick when falls inside a rangebreak#4734

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

 Closed

archmoj
wants to merge
4
commits into

from

 Closed


Relocate first tick when falls inside a rangebreak
#4734
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
4137a12

centralize & refactor range expansions


archmoj Apr 6, 2020
088251d

move first tick if falls inside a break - add and update tests


archmoj Apr 6, 2020
b84eacf

reverse the loop so that undefined tick0 replace with start of the br…


archmoj Apr 6, 2020
f12ffd8

treat reversed ranges the same


archmoj Apr 6, 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


34 changes: 27 additions & 7 deletions
src/plots/cartesian/axes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,15 @@ var autorange = require('./autorange');
axes.getAutoRange = autorange.getAutoRange;
axes.findExtremes = autorange.findExtremes;

var epsilon = 0.0001;
function expandRange(range) {
 var delta = (range[1] - range[0]) * epsilon;
 return [
 range[0] - delta,
 range[1] + delta
 ];
}

/*
 * find the list of possible axes to reference with an xref or yref attribute
 * and coerce it to that list
Expand DownExpand Up@@ -566,8 +575,9 @@ axes.calcTicks = function calcTicks(ax) {
 ax._tmin = axes.tickFirst(ax);

 // add a tiny bit so we get ticks which may have rounded out
 var startTick = rng[0] * 1.0001 - rng[1] * 0.0001;
 var endTick = rng[1] * 1.0001 - rng[0] * 0.0001;
 var exRng = expandRange(rng);
 var startTick = exRng[0];
 var endTick = exRng[1];
 // check for reversed axis
 var axrev = (rng[1] < rng[0]);

Expand DownExpand Up@@ -691,10 +701,9 @@ function arrayTicks(ax) {
 var text = ax.ticktext;
 var ticksOut = new Array(vals.length);
 var rng = Lib.simpleMap(ax.range, ax.r2l);
 var r0expanded = rng[0] * 1.0001 - rng[1] * 0.0001;
 var r1expanded = rng[1] * 1.0001 - rng[0] * 0.0001;
 var tickMin = Math.min(r0expanded, r1expanded);
 var tickMax = Math.max(r0expanded, r1expanded);
 var exRng = expandRange(rng);
 var tickMin = Math.min(exRng[0], exRng[1]);
 var tickMax = Math.max(exRng[0], exRng[1]);
 var j = 0;

 // without a text array, just format the given values as any other ticks
Expand DownExpand Up@@ -956,10 +965,21 @@ axes.tickFirst = function(ax) {
 var sRound = axrev ? Math.floor : Math.ceil;
 // add a tiny extra bit to make sure we get ticks
 // that may have been rounded out
 var r0 = rng[0] * 1.0001 - rng[1] * 0.0001;
 var r0 = expandRange(rng)[0];
 var dtick = ax.dtick;
 var tick0 = r2l(ax.tick0);

 if(ax.rangebreaks && ax.maskBreaks(tick0) === BADNUM) {
 // attempt move tick0 outside rangebreak
 for(var h = 24; h > 0; h--) {
 var delta = h * ONEHOUR;
 if(ax.maskBreaks(tick0 - delta) !== BADNUM) {
 tick0 -= delta;
 break;
 }
 }
 }

 if(isNumeric(dtick)) {
 var tmin = sRound((r0 - tick0) / dtick) * dtick + tick0;

Expand Down
Binary file modifiedtest/image/baselines/axes_breaks-gridlines.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/axes_breaks-night_autorange-reversed.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/axes_breaks-rangeslider.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedtest/image/baselines/axes_breaks-tick0-position.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/axes_breaks-weekends-weeknights.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

218 changes: 218 additions & 0 deletions
test/image/mocks/axes_breaks-tick0-position.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,218 @@
{
 "data": [
 {
 "type": "scatter",
 "mode": "markers",
 "x": [
 "1970-01-01T09:00:00",
 "1970-01-01T10:00:00",
 "1970-01-01T11:00:00",
 "1970-01-01T12:00:00",
 "1970-01-01T13:00:00",
 "1970-01-01T14:00:00",
 "1970-01-01T15:00:00",
 "1970-01-01T16:00:00",
 "1970-01-02T09:00:00",
 "1970-01-02T10:00:00",
 "1970-01-02T11:00:00",
 "1970-01-02T12:00:00",
 "1970-01-02T13:00:00",
 "1970-01-02T14:00:00",
 "1970-01-02T15:00:00",
 "1970-01-02T16:00:00",
 "1970-01-03T09:00:00",
 "1970-01-03T10:00:00",
 "1970-01-03T11:00:00",
 "1970-01-03T12:00:00",
 "1970-01-03T13:00:00",
 "1970-01-03T14:00:00",
 "1970-01-03T15:00:00",
 "1970-01-03T16:00:00",
 "1970-01-04T09:00:00",
 "1970-01-04T10:00:00",
 "1970-01-04T11:00:00",
 "1970-01-04T12:00:00",
 "1970-01-04T13:00:00",
 "1970-01-04T14:00:00",
 "1970-01-04T15:00:00",
 "1970-01-04T16:00:00",
 "1970-01-05T09:00:00",
 "1970-01-05T10:00:00",
 "1970-01-05T11:00:00",
 "1970-01-05T12:00:00",
 "1970-01-05T13:00:00",
 "1970-01-05T14:00:00",
 "1970-01-05T15:00:00",
 "1970-01-05T16:00:00"
 ],
 "y": [
 1,
 2,
 3,
 4,
 5,
 6,
 7,
 8,
 9,
 10,
 11,
 12,
 13,
 14,
 15,
 16,
 17,
 18,
 19,
 20,
 21,
 22,
 23,
 24,
 25,
 26,
 27,
 28,
 29,
 30,
 31,
 32,
 33,
 34,
 35,
 36,
 37,
 38,
 39,
 40
 ]
 },
 {
 "type": "scatter",
 "mode": "markers",
 "x": [
 "1970-01-01T09:00:00",
 "1970-01-01T10:00:00",
 "1970-01-01T11:00:00",
 "1970-01-01T12:00:00",
 "1970-01-01T13:00:00",
 "1970-01-01T14:00:00",
 "1970-01-01T15:00:00",
 "1970-01-01T16:00:00",
 "1970-01-02T09:00:00",
 "1970-01-02T10:00:00",
 "1970-01-02T11:00:00",
 "1970-01-02T12:00:00",
 "1970-01-02T13:00:00",
 "1970-01-02T14:00:00",
 "1970-01-02T15:00:00",
 "1970-01-02T16:00:00",
 "1970-01-03T09:00:00",
 "1970-01-03T10:00:00",
 "1970-01-03T11:00:00",
 "1970-01-03T12:00:00",
 "1970-01-03T13:00:00",
 "1970-01-03T14:00:00",
 "1970-01-03T15:00:00",
 "1970-01-03T16:00:00",
 "1970-01-04T09:00:00",
 "1970-01-04T10:00:00",
 "1970-01-04T11:00:00",
 "1970-01-04T12:00:00",
 "1970-01-04T13:00:00",
 "1970-01-04T14:00:00",
 "1970-01-04T15:00:00",
 "1970-01-04T16:00:00",
 "1970-01-05T09:00:00",
 "1970-01-05T10:00:00",
 "1970-01-05T11:00:00",
 "1970-01-05T12:00:00",
 "1970-01-05T13:00:00",
 "1970-01-05T14:00:00",
 "1970-01-05T15:00:00",
 "1970-01-05T16:00:00"
 ],
 "y": [
 1,
 2,
 3,
 4,
 5,
 6,
 7,
 8,
 9,
 10,
 11,
 12,
 13,
 14,
 15,
 16,
 17,
 18,
 19,
 20,
 21,
 22,
 23,
 24,
 25,
 26,
 27,
 28,
 29,
 30,
 31,
 32,
 33,
 34,
 35,
 36,
 37,
 38,
 39,
 40
 ],
 "xaxis": "x2",
 "yaxis": "y2"
 }
 ],
 "layout": {
 "width": 800,
 "height": 400,
 "showlegend": false,
 "xaxis": {
 "domain": [0, 0.45],
 "dtick": 86400000,
 "rangebreaks": [
 {
 "bounds": [
 17,
 9
 ],
 "pattern": "hour"
 }
 ]
 },
 "xaxis2": {
 "domain": [0.55, 1],
 "dtick": 86400000,
 "rangebreaks": [
 {
 "bounds": [
 17,
 9
 ],
 "pattern": "hour"
 }
 ],
 "autorange": "reversed",
 "anchor": "y2"
 },
 "yaxis2": {
 "anchor": "x2"
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Relocate first tick when falls inside a rangebreak by archmoj · Pull Request #4734 · plotly/plotly.js · GitHub
Skip to content
Relocate first tick when falls inside a rangebreak#4734

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

 Closed

archmoj
wants to merge
4
commits into

from

 Closed


Relocate first tick when falls inside a rangebreak
#4734
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
4137a12

centralize & refactor range expansions


archmoj Apr 6, 2020
088251d

move first tick if falls inside a break - add and update tests


archmoj Apr 6, 2020
b84eacf

reverse the loop so that undefined tick0 replace with start of the br…


archmoj Apr 6, 2020
f12ffd8

treat reversed ranges the same


archmoj Apr 6, 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


34 changes: 27 additions & 7 deletions
src/plots/cartesian/axes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,15 @@ var autorange = require('./autorange');
axes.getAutoRange = autorange.getAutoRange;
axes.findExtremes = autorange.findExtremes;

var epsilon = 0.0001;
function expandRange(range) {
 var delta = (range[1] - range[0]) * epsilon;
 return [
 range[0] - delta,
 range[1] + delta
 ];
}

/*
 * find the list of possible axes to reference with an xref or yref attribute
 * and coerce it to that list
Expand DownExpand Up@@ -566,8 +575,9 @@ axes.calcTicks = function calcTicks(ax) {
 ax._tmin = axes.tickFirst(ax);

 // add a tiny bit so we get ticks which may have rounded out
 var startTick = rng[0] * 1.0001 - rng[1] * 0.0001;
 var endTick = rng[1] * 1.0001 - rng[0] * 0.0001;
 var exRng = expandRange(rng);
 var startTick = exRng[0];
 var endTick = exRng[1];
 // check for reversed axis
 var axrev = (rng[1] < rng[0]);

Expand DownExpand Up@@ -691,10 +701,9 @@ function arrayTicks(ax) {
 var text = ax.ticktext;
 var ticksOut = new Array(vals.length);
 var rng = Lib.simpleMap(ax.range, ax.r2l);
 var r0expanded = rng[0] * 1.0001 - rng[1] * 0.0001;
 var r1expanded = rng[1] * 1.0001 - rng[0] * 0.0001;
 var tickMin = Math.min(r0expanded, r1expanded);
 var tickMax = Math.max(r0expanded, r1expanded);
 var exRng = expandRange(rng);
 var tickMin = Math.min(exRng[0], exRng[1]);
 var tickMax = Math.max(exRng[0], exRng[1]);
 var j = 0;

 // without a text array, just format the given values as any other ticks
Expand DownExpand Up@@ -956,10 +965,21 @@ axes.tickFirst = function(ax) {
 var sRound = axrev ? Math.floor : Math.ceil;
 // add a tiny extra bit to make sure we get ticks
 // that may have been rounded out
 var r0 = rng[0] * 1.0001 - rng[1] * 0.0001;
 var r0 = expandRange(rng)[0];
 var dtick = ax.dtick;
 var tick0 = r2l(ax.tick0);

 if(ax.rangebreaks && ax.maskBreaks(tick0) === BADNUM) {
 // attempt move tick0 outside rangebreak
 for(var h = 24; h > 0; h--) {
 var delta = h * ONEHOUR;
 if(ax.maskBreaks(tick0 - delta) !== BADNUM) {
 tick0 -= delta;
 break;
 }
 }
 }

 if(isNumeric(dtick)) {
 var tmin = sRound((r0 - tick0) / dtick) * dtick + tick0;

Expand Down
Binary file modifiedtest/image/baselines/axes_breaks-gridlines.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/axes_breaks-night_autorange-reversed.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/axes_breaks-rangeslider.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedtest/image/baselines/axes_breaks-tick0-position.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/axes_breaks-weekends-weeknights.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

218 changes: 218 additions & 0 deletions
test/image/mocks/axes_breaks-tick0-position.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,218 @@
{
 "data": [
 {
 "type": "scatter",
 "mode": "markers",
 "x": [
 "1970-01-01T09:00:00",
 "1970-01-01T10:00:00",
 "1970-01-01T11:00:00",
 "1970-01-01T12:00:00",
 "1970-01-01T13:00:00",
 "1970-01-01T14:00:00",
 "1970-01-01T15:00:00",
 "1970-01-01T16:00:00",
 "1970-01-02T09:00:00",
 "1970-01-02T10:00:00",
 "1970-01-02T11:00:00",
 "1970-01-02T12:00:00",
 "1970-01-02T13:00:00",
 "1970-01-02T14:00:00",
 "1970-01-02T15:00:00",
 "1970-01-02T16:00:00",
 "1970-01-03T09:00:00",
 "1970-01-03T10:00:00",
 "1970-01-03T11:00:00",
 "1970-01-03T12:00:00",
 "1970-01-03T13:00:00",
 "1970-01-03T14:00:00",
 "1970-01-03T15:00:00",
 "1970-01-03T16:00:00",
 "1970-01-04T09:00:00",
 "1970-01-04T10:00:00",
 "1970-01-04T11:00:00",
 "1970-01-04T12:00:00",
 "1970-01-04T13:00:00",
 "1970-01-04T14:00:00",
 "1970-01-04T15:00:00",
 "1970-01-04T16:00:00",
 "1970-01-05T09:00:00",
 "1970-01-05T10:00:00",
 "1970-01-05T11:00:00",
 "1970-01-05T12:00:00",
 "1970-01-05T13:00:00",
 "1970-01-05T14:00:00",
 "1970-01-05T15:00:00",
 "1970-01-05T16:00:00"
 ],
 "y": [
 1,
 2,
 3,
 4,
 5,
 6,
 7,
 8,
 9,
 10,
 11,
 12,
 13,
 14,
 15,
 16,
 17,
 18,
 19,
 20,
 21,
 22,
 23,
 24,
 25,
 26,
 27,
 28,
 29,
 30,
 31,
 32,
 33,
 34,
 35,
 36,
 37,
 38,
 39,
 40
 ]
 },
 {
 "type": "scatter",
 "mode": "markers",
 "x": [
 "1970-01-01T09:00:00",
 "1970-01-01T10:00:00",
 "1970-01-01T11:00:00",
 "1970-01-01T12:00:00",
 "1970-01-01T13:00:00",
 "1970-01-01T14:00:00",
 "1970-01-01T15:00:00",
 "1970-01-01T16:00:00",
 "1970-01-02T09:00:00",
 "1970-01-02T10:00:00",
 "1970-01-02T11:00:00",
 "1970-01-02T12:00:00",
 "1970-01-02T13:00:00",
 "1970-01-02T14:00:00",
 "1970-01-02T15:00:00",
 "1970-01-02T16:00:00",
 "1970-01-03T09:00:00",
 "1970-01-03T10:00:00",
 "1970-01-03T11:00:00",
 "1970-01-03T12:00:00",
 "1970-01-03T13:00:00",
 "1970-01-03T14:00:00",
 "1970-01-03T15:00:00",
 "1970-01-03T16:00:00",
 "1970-01-04T09:00:00",
 "1970-01-04T10:00:00",
 "1970-01-04T11:00:00",
 "1970-01-04T12:00:00",
 "1970-01-04T13:00:00",
 "1970-01-04T14:00:00",
 "1970-01-04T15:00:00",
 "1970-01-04T16:00:00",
 "1970-01-05T09:00:00",
 "1970-01-05T10:00:00",
 "1970-01-05T11:00:00",
 "1970-01-05T12:00:00",
 "1970-01-05T13:00:00",
 "1970-01-05T14:00:00",
 "1970-01-05T15:00:00",
 "1970-01-05T16:00:00"
 ],
 "y": [
 1,
 2,
 3,
 4,
 5,
 6,
 7,
 8,
 9,
 10,
 11,
 12,
 13,
 14,
 15,
 16,
 17,
 18,
 19,
 20,
 21,
 22,
 23,
 24,
 25,
 26,
 27,
 28,
 29,
 30,
 31,
 32,
 33,
 34,
 35,
 36,
 37,
 38,
 39,
 40
 ],
 "xaxis": "x2",
 "yaxis": "y2"
 }
 ],
 "layout": {
 "width": 800,
 "height": 400,
 "showlegend": false,
 "xaxis": {
 "domain": [0, 0.45],
 "dtick": 86400000,
 "rangebreaks": [
 {
 "bounds": [
 17,
 9
 ],
 "pattern": "hour"
 }
 ]
 },
 "xaxis2": {
 "domain": [0.55, 1],
 "dtick": 86400000,
 "rangebreaks": [
 {
 "bounds": [
 17,
 9
 ],
 "pattern": "hour"
 }
 ],
 "autorange": "reversed",
 "anchor": "y2"
 },
 "yaxis2": {
 "anchor": "x2"
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Relocate first tick when falls inside a rangebreak by archmoj · Pull Request #4734 · plotly/plotly.js · GitHub
Skip to content
Relocate first tick when falls inside a rangebreak#4734

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

 Closed

archmoj
wants to merge
4
commits into

from

 Closed


Relocate first tick when falls inside a rangebreak
#4734
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
4137a12

centralize & refactor range expansions


archmoj Apr 6, 2020
088251d

move first tick if falls inside a break - add and update tests


archmoj Apr 6, 2020
b84eacf

reverse the loop so that undefined tick0 replace with start of the br…


archmoj Apr 6, 2020
f12ffd8

treat reversed ranges the same


archmoj Apr 6, 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


34 changes: 27 additions & 7 deletions
src/plots/cartesian/axes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,15 @@ var autorange = require('./autorange');
axes.getAutoRange = autorange.getAutoRange;
axes.findExtremes = autorange.findExtremes;

var epsilon = 0.0001;
function expandRange(range) {
 var delta = (range[1] - range[0]) * epsilon;
 return [
 range[0] - delta,
 range[1] + delta
 ];
}

/*
 * find the list of possible axes to reference with an xref or yref attribute
 * and coerce it to that list
Expand DownExpand Up@@ -566,8 +575,9 @@ axes.calcTicks = function calcTicks(ax) {
 ax._tmin = axes.tickFirst(ax);

 // add a tiny bit so we get ticks which may have rounded out
 var startTick = rng[0] * 1.0001 - rng[1] * 0.0001;
 var endTick = rng[1] * 1.0001 - rng[0] * 0.0001;
 var exRng = expandRange(rng);
 var startTick = exRng[0];
 var endTick = exRng[1];
 // check for reversed axis
 var axrev = (rng[1] < rng[0]);

Expand DownExpand Up@@ -691,10 +701,9 @@ function arrayTicks(ax) {
 var text = ax.ticktext;
 var ticksOut = new Array(vals.length);
 var rng = Lib.simpleMap(ax.range, ax.r2l);
 var r0expanded = rng[0] * 1.0001 - rng[1] * 0.0001;
 var r1expanded = rng[1] * 1.0001 - rng[0] * 0.0001;
 var tickMin = Math.min(r0expanded, r1expanded);
 var tickMax = Math.max(r0expanded, r1expanded);
 var exRng = expandRange(rng);
 var tickMin = Math.min(exRng[0], exRng[1]);
 var tickMax = Math.max(exRng[0], exRng[1]);
 var j = 0;

 // without a text array, just format the given values as any other ticks
Expand DownExpand Up@@ -956,10 +965,21 @@ axes.tickFirst = function(ax) {
 var sRound = axrev ? Math.floor : Math.ceil;
 // add a tiny extra bit to make sure we get ticks
 // that may have been rounded out
 var r0 = rng[0] * 1.0001 - rng[1] * 0.0001;
 var r0 = expandRange(rng)[0];
 var dtick = ax.dtick;
 var tick0 = r2l(ax.tick0);

 if(ax.rangebreaks && ax.maskBreaks(tick0) === BADNUM) {
 // attempt move tick0 outside rangebreak
 for(var h = 24; h > 0; h--) {
 var delta = h * ONEHOUR;
 if(ax.maskBreaks(tick0 - delta) !== BADNUM) {
 tick0 -= delta;
 break;
 }
 }
 }

 if(isNumeric(dtick)) {
 var tmin = sRound((r0 - tick0) / dtick) * dtick + tick0;

Expand Down
Binary file modifiedtest/image/baselines/axes_breaks-gridlines.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/axes_breaks-night_autorange-reversed.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/axes_breaks-rangeslider.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedtest/image/baselines/axes_breaks-tick0-position.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/axes_breaks-weekends-weeknights.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

218 changes: 218 additions & 0 deletions
test/image/mocks/axes_breaks-tick0-position.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,218 @@
{
 "data": [
 {
 "type": "scatter",
 "mode": "markers",
 "x": [
 "1970-01-01T09:00:00",
 "1970-01-01T10:00:00",
 "1970-01-01T11:00:00",
 "1970-01-01T12:00:00",
 "1970-01-01T13:00:00",
 "1970-01-01T14:00:00",
 "1970-01-01T15:00:00",
 "1970-01-01T16:00:00",
 "1970-01-02T09:00:00",
 "1970-01-02T10:00:00",
 "1970-01-02T11:00:00",
 "1970-01-02T12:00:00",
 "1970-01-02T13:00:00",
 "1970-01-02T14:00:00",
 "1970-01-02T15:00:00",
 "1970-01-02T16:00:00",
 "1970-01-03T09:00:00",
 "1970-01-03T10:00:00",
 "1970-01-03T11:00:00",
 "1970-01-03T12:00:00",
 "1970-01-03T13:00:00",
 "1970-01-03T14:00:00",
 "1970-01-03T15:00:00",
 "1970-01-03T16:00:00",
 "1970-01-04T09:00:00",
 "1970-01-04T10:00:00",
 "1970-01-04T11:00:00",
 "1970-01-04T12:00:00",
 "1970-01-04T13:00:00",
 "1970-01-04T14:00:00",
 "1970-01-04T15:00:00",
 "1970-01-04T16:00:00",
 "1970-01-05T09:00:00",
 "1970-01-05T10:00:00",
 "1970-01-05T11:00:00",
 "1970-01-05T12:00:00",
 "1970-01-05T13:00:00",
 "1970-01-05T14:00:00",
 "1970-01-05T15:00:00",
 "1970-01-05T16:00:00"
 ],
 "y": [
 1,
 2,
 3,
 4,
 5,
 6,
 7,
 8,
 9,
 10,
 11,
 12,
 13,
 14,
 15,
 16,
 17,
 18,
 19,
 20,
 21,
 22,
 23,
 24,
 25,
 26,
 27,
 28,
 29,
 30,
 31,
 32,
 33,
 34,
 35,
 36,
 37,
 38,
 39,
 40
 ]
 },
 {
 "type": "scatter",
 "mode": "markers",
 "x": [
 "1970-01-01T09:00:00",
 "1970-01-01T10:00:00",
 "1970-01-01T11:00:00",
 "1970-01-01T12:00:00",
 "1970-01-01T13:00:00",
 "1970-01-01T14:00:00",
 "1970-01-01T15:00:00",
 "1970-01-01T16:00:00",
 "1970-01-02T09:00:00",
 "1970-01-02T10:00:00",
 "1970-01-02T11:00:00",
 "1970-01-02T12:00:00",
 "1970-01-02T13:00:00",
 "1970-01-02T14:00:00",
 "1970-01-02T15:00:00",
 "1970-01-02T16:00:00",
 "1970-01-03T09:00:00",
 "1970-01-03T10:00:00",
 "1970-01-03T11:00:00",
 "1970-01-03T12:00:00",
 "1970-01-03T13:00:00",
 "1970-01-03T14:00:00",
 "1970-01-03T15:00:00",
 "1970-01-03T16:00:00",
 "1970-01-04T09:00:00",
 "1970-01-04T10:00:00",
 "1970-01-04T11:00:00",
 "1970-01-04T12:00:00",
 "1970-01-04T13:00:00",
 "1970-01-04T14:00:00",
 "1970-01-04T15:00:00",
 "1970-01-04T16:00:00",
 "1970-01-05T09:00:00",
 "1970-01-05T10:00:00",
 "1970-01-05T11:00:00",
 "1970-01-05T12:00:00",
 "1970-01-05T13:00:00",
 "1970-01-05T14:00:00",
 "1970-01-05T15:00:00",
 "1970-01-05T16:00:00"
 ],
 "y": [
 1,
 2,
 3,
 4,
 5,
 6,
 7,
 8,
 9,
 10,
 11,
 12,
 13,
 14,
 15,
 16,
 17,
 18,
 19,
 20,
 21,
 22,
 23,
 24,
 25,
 26,
 27,
 28,
 29,
 30,
 31,
 32,
 33,
 34,
 35,
 36,
 37,
 38,
 39,
 40
 ],
 "xaxis": "x2",
 "yaxis": "y2"
 }
 ],
 "layout": {
 "width": 800,
 "height": 400,
 "showlegend": false,
 "xaxis": {
 "domain": [0, 0.45],
 "dtick": 86400000,
 "rangebreaks": [
 {
 "bounds": [
 17,
 9
 ],
 "pattern": "hour"
 }
 ]
 },
 "xaxis2": {
 "domain": [0.55, 1],
 "dtick": 86400000,
 "rangebreaks": [
 {
 "bounds": [
 17,
 9
 ],
 "pattern": "hour"
 }
 ],
 "autorange": "reversed",
 "anchor": "y2"
 },
 "yaxis2": {
 "anchor": "x2"
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Relocate first tick when falls inside a rangebreak by archmoj · Pull Request #4734 · plotly/plotly.js · GitHub
Skip to content
Relocate first tick when falls inside a rangebreak#4734

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

 Closed

archmoj
wants to merge
4
commits into

from

 Closed


Relocate first tick when falls inside a rangebreak
#4734
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
4137a12

centralize & refactor range expansions


archmoj Apr 6, 2020
088251d

move first tick if falls inside a break - add and update tests


archmoj Apr 6, 2020
b84eacf

reverse the loop so that undefined tick0 replace with start of the br…


archmoj Apr 6, 2020
f12ffd8

treat reversed ranges the same


archmoj Apr 6, 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


34 changes: 27 additions & 7 deletions
src/plots/cartesian/axes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,15 @@ var autorange = require('./autorange');
axes.getAutoRange = autorange.getAutoRange;
axes.findExtremes = autorange.findExtremes;

var epsilon = 0.0001;
function expandRange(range) {
 var delta = (range[1] - range[0]) * epsilon;
 return [
 range[0] - delta,
 range[1] + delta
 ];
}

/*
 * find the list of possible axes to reference with an xref or yref attribute
 * and coerce it to that list
Expand DownExpand Up@@ -566,8 +575,9 @@ axes.calcTicks = function calcTicks(ax) {
 ax._tmin = axes.tickFirst(ax);

 // add a tiny bit so we get ticks which may have rounded out
 var startTick = rng[0] * 1.0001 - rng[1] * 0.0001;
 var endTick = rng[1] * 1.0001 - rng[0] * 0.0001;
 var exRng = expandRange(rng);
 var startTick = exRng[0];
 var endTick = exRng[1];
 // check for reversed axis
 var axrev = (rng[1] < rng[0]);

Expand DownExpand Up@@ -691,10 +701,9 @@ function arrayTicks(ax) {
 var text = ax.ticktext;
 var ticksOut = new Array(vals.length);
 var rng = Lib.simpleMap(ax.range, ax.r2l);
 var r0expanded = rng[0] * 1.0001 - rng[1] * 0.0001;
 var r1expanded = rng[1] * 1.0001 - rng[0] * 0.0001;
 var tickMin = Math.min(r0expanded, r1expanded);
 var tickMax = Math.max(r0expanded, r1expanded);
 var exRng = expandRange(rng);
 var tickMin = Math.min(exRng[0], exRng[1]);
 var tickMax = Math.max(exRng[0], exRng[1]);
 var j = 0;

 // without a text array, just format the given values as any other ticks
Expand DownExpand Up@@ -956,10 +965,21 @@ axes.tickFirst = function(ax) {
 var sRound = axrev ? Math.floor : Math.ceil;
 // add a tiny extra bit to make sure we get ticks
 // that may have been rounded out
 var r0 = rng[0] * 1.0001 - rng[1] * 0.0001;
 var r0 = expandRange(rng)[0];
 var dtick = ax.dtick;
 var tick0 = r2l(ax.tick0);

 if(ax.rangebreaks && ax.maskBreaks(tick0) === BADNUM) {
 // attempt move tick0 outside rangebreak
 for(var h = 24; h > 0; h--) {
 var delta = h * ONEHOUR;
 if(ax.maskBreaks(tick0 - delta) !== BADNUM) {
 tick0 -= delta;
 break;
 }
 }
 }

 if(isNumeric(dtick)) {
 var tmin = sRound((r0 - tick0) / dtick) * dtick + tick0;

Expand Down
Binary file modifiedtest/image/baselines/axes_breaks-gridlines.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/axes_breaks-night_autorange-reversed.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/axes_breaks-rangeslider.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedtest/image/baselines/axes_breaks-tick0-position.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/axes_breaks-weekends-weeknights.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

218 changes: 218 additions & 0 deletions
test/image/mocks/axes_breaks-tick0-position.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,218 @@
{
 "data": [
 {
 "type": "scatter",
 "mode": "markers",
 "x": [
 "1970-01-01T09:00:00",
 "1970-01-01T10:00:00",
 "1970-01-01T11:00:00",
 "1970-01-01T12:00:00",
 "1970-01-01T13:00:00",
 "1970-01-01T14:00:00",
 "1970-01-01T15:00:00",
 "1970-01-01T16:00:00",
 "1970-01-02T09:00:00",
 "1970-01-02T10:00:00",
 "1970-01-02T11:00:00",
 "1970-01-02T12:00:00",
 "1970-01-02T13:00:00",
 "1970-01-02T14:00:00",
 "1970-01-02T15:00:00",
 "1970-01-02T16:00:00",
 "1970-01-03T09:00:00",
 "1970-01-03T10:00:00",
 "1970-01-03T11:00:00",
 "1970-01-03T12:00:00",
 "1970-01-03T13:00:00",
 "1970-01-03T14:00:00",
 "1970-01-03T15:00:00",
 "1970-01-03T16:00:00",
 "1970-01-04T09:00:00",
 "1970-01-04T10:00:00",
 "1970-01-04T11:00:00",
 "1970-01-04T12:00:00",
 "1970-01-04T13:00:00",
 "1970-01-04T14:00:00",
 "1970-01-04T15:00:00",
 "1970-01-04T16:00:00",
 "1970-01-05T09:00:00",
 "1970-01-05T10:00:00",
 "1970-01-05T11:00:00",
 "1970-01-05T12:00:00",
 "1970-01-05T13:00:00",
 "1970-01-05T14:00:00",
 "1970-01-05T15:00:00",
 "1970-01-05T16:00:00"
 ],
 "y": [
 1,
 2,
 3,
 4,
 5,
 6,
 7,
 8,
 9,
 10,
 11,
 12,
 13,
 14,
 15,
 16,
 17,
 18,
 19,
 20,
 21,
 22,
 23,
 24,
 25,
 26,
 27,
 28,
 29,
 30,
 31,
 32,
 33,
 34,
 35,
 36,
 37,
 38,
 39,
 40
 ]
 },
 {
 "type": "scatter",
 "mode": "markers",
 "x": [
 "1970-01-01T09:00:00",
 "1970-01-01T10:00:00",
 "1970-01-01T11:00:00",
 "1970-01-01T12:00:00",
 "1970-01-01T13:00:00",
 "1970-01-01T14:00:00",
 "1970-01-01T15:00:00",
 "1970-01-01T16:00:00",
 "1970-01-02T09:00:00",
 "1970-01-02T10:00:00",
 "1970-01-02T11:00:00",
 "1970-01-02T12:00:00",
 "1970-01-02T13:00:00",
 "1970-01-02T14:00:00",
 "1970-01-02T15:00:00",
 "1970-01-02T16:00:00",
 "1970-01-03T09:00:00",
 "1970-01-03T10:00:00",
 "1970-01-03T11:00:00",
 "1970-01-03T12:00:00",
 "1970-01-03T13:00:00",
 "1970-01-03T14:00:00",
 "1970-01-03T15:00:00",
 "1970-01-03T16:00:00",
 "1970-01-04T09:00:00",
 "1970-01-04T10:00:00",
 "1970-01-04T11:00:00",
 "1970-01-04T12:00:00",
 "1970-01-04T13:00:00",
 "1970-01-04T14:00:00",
 "1970-01-04T15:00:00",
 "1970-01-04T16:00:00",
 "1970-01-05T09:00:00",
 "1970-01-05T10:00:00",
 "1970-01-05T11:00:00",
 "1970-01-05T12:00:00",
 "1970-01-05T13:00:00",
 "1970-01-05T14:00:00",
 "1970-01-05T15:00:00",
 "1970-01-05T16:00:00"
 ],
 "y": [
 1,
 2,
 3,
 4,
 5,
 6,
 7,
 8,
 9,
 10,
 11,
 12,
 13,
 14,
 15,
 16,
 17,
 18,
 19,
 20,
 21,
 22,
 23,
 24,
 25,
 26,
 27,
 28,
 29,
 30,
 31,
 32,
 33,
 34,
 35,
 36,
 37,
 38,
 39,
 40
 ],
 "xaxis": "x2",
 "yaxis": "y2"
 }
 ],
 "layout": {
 "width": 800,
 "height": 400,
 "showlegend": false,
 "xaxis": {
 "domain": [0, 0.45],
 "dtick": 86400000,
 "rangebreaks": [
 {
 "bounds": [
 17,
 9
 ],
 "pattern": "hour"
 }
 ]
 },
 "xaxis2": {
 "domain": [0.55, 1],
 "dtick": 86400000,
 "rangebreaks": [
 {
 "bounds": [
 17,
 9
 ],
 "pattern": "hour"
 }
 ],
 "autorange": "reversed",
 "anchor": "y2"
 },
 "yaxis2": {
 "anchor": "x2"
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Relocate first tick when falls inside a rangebreak by archmoj · Pull Request #4734 · plotly/plotly.js · GitHub
Skip to content
Relocate first tick when falls inside a rangebreak#4734

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

 Closed

archmoj
wants to merge
4
commits into

from

 Closed


Relocate first tick when falls inside a rangebreak
#4734
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
4137a12

centralize & refactor range expansions


archmoj Apr 6, 2020
088251d

move first tick if falls inside a break - add and update tests


archmoj Apr 6, 2020
b84eacf

reverse the loop so that undefined tick0 replace with start of the br…


archmoj Apr 6, 2020
f12ffd8

treat reversed ranges the same


archmoj Apr 6, 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


34 changes: 27 additions & 7 deletions
src/plots/cartesian/axes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,15 @@ var autorange = require('./autorange');
axes.getAutoRange = autorange.getAutoRange;
axes.findExtremes = autorange.findExtremes;

var epsilon = 0.0001;
function expandRange(range) {
 var delta = (range[1] - range[0]) * epsilon;
 return [
 range[0] - delta,
 range[1] + delta
 ];
}

/*
 * find the list of possible axes to reference with an xref or yref attribute
 * and coerce it to that list
Expand DownExpand Up@@ -566,8 +575,9 @@ axes.calcTicks = function calcTicks(ax) {
 ax._tmin = axes.tickFirst(ax);

 // add a tiny bit so we get ticks which may have rounded out
 var startTick = rng[0] * 1.0001 - rng[1] * 0.0001;
 var endTick = rng[1] * 1.0001 - rng[0] * 0.0001;
 var exRng = expandRange(rng);
 var startTick = exRng[0];
 var endTick = exRng[1];
 // check for reversed axis
 var axrev = (rng[1] < rng[0]);

Expand DownExpand Up@@ -691,10 +701,9 @@ function arrayTicks(ax) {
 var text = ax.ticktext;
 var ticksOut = new Array(vals.length);
 var rng = Lib.simpleMap(ax.range, ax.r2l);
 var r0expanded = rng[0] * 1.0001 - rng[1] * 0.0001;
 var r1expanded = rng[1] * 1.0001 - rng[0] * 0.0001;
 var tickMin = Math.min(r0expanded, r1expanded);
 var tickMax = Math.max(r0expanded, r1expanded);
 var exRng = expandRange(rng);
 var tickMin = Math.min(exRng[0], exRng[1]);
 var tickMax = Math.max(exRng[0], exRng[1]);
 var j = 0;

 // without a text array, just format the given values as any other ticks
Expand DownExpand Up@@ -956,10 +965,21 @@ axes.tickFirst = function(ax) {
 var sRound = axrev ? Math.floor : Math.ceil;
 // add a tiny extra bit to make sure we get ticks
 // that may have been rounded out
 var r0 = rng[0] * 1.0001 - rng[1] * 0.0001;
 var r0 = expandRange(rng)[0];
 var dtick = ax.dtick;
 var tick0 = r2l(ax.tick0);

 if(ax.rangebreaks && ax.maskBreaks(tick0) === BADNUM) {
 // attempt move tick0 outside rangebreak
 for(var h = 24; h > 0; h--) {
 var delta = h * ONEHOUR;
 if(ax.maskBreaks(tick0 - delta) !== BADNUM) {
 tick0 -= delta;
 break;
 }
 }
 }

 if(isNumeric(dtick)) {
 var tmin = sRound((r0 - tick0) / dtick) * dtick + tick0;

Expand Down
Binary file modifiedtest/image/baselines/axes_breaks-gridlines.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/axes_breaks-night_autorange-reversed.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/axes_breaks-rangeslider.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedtest/image/baselines/axes_breaks-tick0-position.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/axes_breaks-weekends-weeknights.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

218 changes: 218 additions & 0 deletions
test/image/mocks/axes_breaks-tick0-position.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,218 @@
{
 "data": [
 {
 "type": "scatter",
 "mode": "markers",
 "x": [
 "1970-01-01T09:00:00",
 "1970-01-01T10:00:00",
 "1970-01-01T11:00:00",
 "1970-01-01T12:00:00",
 "1970-01-01T13:00:00",
 "1970-01-01T14:00:00",
 "1970-01-01T15:00:00",
 "1970-01-01T16:00:00",
 "1970-01-02T09:00:00",
 "1970-01-02T10:00:00",
 "1970-01-02T11:00:00",
 "1970-01-02T12:00:00",
 "1970-01-02T13:00:00",
 "1970-01-02T14:00:00",
 "1970-01-02T15:00:00",
 "1970-01-02T16:00:00",
 "1970-01-03T09:00:00",
 "1970-01-03T10:00:00",
 "1970-01-03T11:00:00",
 "1970-01-03T12:00:00",
 "1970-01-03T13:00:00",
 "1970-01-03T14:00:00",
 "1970-01-03T15:00:00",
 "1970-01-03T16:00:00",
 "1970-01-04T09:00:00",
 "1970-01-04T10:00:00",
 "1970-01-04T11:00:00",
 "1970-01-04T12:00:00",
 "1970-01-04T13:00:00",
 "1970-01-04T14:00:00",
 "1970-01-04T15:00:00",
 "1970-01-04T16:00:00",
 "1970-01-05T09:00:00",
 "1970-01-05T10:00:00",
 "1970-01-05T11:00:00",
 "1970-01-05T12:00:00",
 "1970-01-05T13:00:00",
 "1970-01-05T14:00:00",
 "1970-01-05T15:00:00",
 "1970-01-05T16:00:00"
 ],
 "y": [
 1,
 2,
 3,
 4,
 5,
 6,
 7,
 8,
 9,
 10,
 11,
 12,
 13,
 14,
 15,
 16,
 17,
 18,
 19,
 20,
 21,
 22,
 23,
 24,
 25,
 26,
 27,
 28,
 29,
 30,
 31,
 32,
 33,
 34,
 35,
 36,
 37,
 38,
 39,
 40
 ]
 },
 {
 "type": "scatter",
 "mode": "markers",
 "x": [
 "1970-01-01T09:00:00",
 "1970-01-01T10:00:00",
 "1970-01-01T11:00:00",
 "1970-01-01T12:00:00",
 "1970-01-01T13:00:00",
 "1970-01-01T14:00:00",
 "1970-01-01T15:00:00",
 "1970-01-01T16:00:00",
 "1970-01-02T09:00:00",
 "1970-01-02T10:00:00",
 "1970-01-02T11:00:00",
 "1970-01-02T12:00:00",
 "1970-01-02T13:00:00",
 "1970-01-02T14:00:00",
 "1970-01-02T15:00:00",
 "1970-01-02T16:00:00",
 "1970-01-03T09:00:00",
 "1970-01-03T10:00:00",
 "1970-01-03T11:00:00",
 "1970-01-03T12:00:00",
 "1970-01-03T13:00:00",
 "1970-01-03T14:00:00",
 "1970-01-03T15:00:00",
 "1970-01-03T16:00:00",
 "1970-01-04T09:00:00",
 "1970-01-04T10:00:00",
 "1970-01-04T11:00:00",
 "1970-01-04T12:00:00",
 "1970-01-04T13:00:00",
 "1970-01-04T14:00:00",
 "1970-01-04T15:00:00",
 "1970-01-04T16:00:00",
 "1970-01-05T09:00:00",
 "1970-01-05T10:00:00",
 "1970-01-05T11:00:00",
 "1970-01-05T12:00:00",
 "1970-01-05T13:00:00",
 "1970-01-05T14:00:00",
 "1970-01-05T15:00:00",
 "1970-01-05T16:00:00"
 ],
 "y": [
 1,
 2,
 3,
 4,
 5,
 6,
 7,
 8,
 9,
 10,
 11,
 12,
 13,
 14,
 15,
 16,
 17,
 18,
 19,
 20,
 21,
 22,
 23,
 24,
 25,
 26,
 27,
 28,
 29,
 30,
 31,
 32,
 33,
 34,
 35,
 36,
 37,
 38,
 39,
 40
 ],
 "xaxis": "x2",
 "yaxis": "y2"
 }
 ],
 "layout": {
 "width": 800,
 "height": 400,
 "showlegend": false,
 "xaxis": {
 "domain": [0, 0.45],
 "dtick": 86400000,
 "rangebreaks": [
 {
 "bounds": [
 17,
 9
 ],
 "pattern": "hour"
 }
 ]
 },
 "xaxis2": {
 "domain": [0.55, 1],
 "dtick": 86400000,
 "rangebreaks": [
 {
 "bounds": [
 17,
 9
 ],
 "pattern": "hour"
 }
 ],
 "autorange": "reversed",
 "anchor": "y2"
 },
 "yaxis2": {
 "anchor": "x2"
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Relocate first tick when falls inside a rangebreak by archmoj · Pull Request #4734 · plotly/plotly.js · GitHub
Skip to content
Relocate first tick when falls inside a rangebreak#4734

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

 Closed

archmoj
wants to merge
4
commits into

from

 Closed


Relocate first tick when falls inside a rangebreak
#4734
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
4137a12

centralize & refactor range expansions


archmoj Apr 6, 2020
088251d

move first tick if falls inside a break - add and update tests


archmoj Apr 6, 2020
b84eacf

reverse the loop so that undefined tick0 replace with start of the br…


archmoj Apr 6, 2020
f12ffd8

treat reversed ranges the same


archmoj Apr 6, 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


34 changes: 27 additions & 7 deletions
src/plots/cartesian/axes.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,6 +56,15 @@ var autorange = require('./autorange');
axes.getAutoRange = autorange.getAutoRange;
axes.findExtremes = autorange.findExtremes;

var epsilon = 0.0001;
function expandRange(range) {
 var delta = (range[1] - range[0]) * epsilon;
 return [
 range[0] - delta,
 range[1] + delta
 ];
}

/*
 * find the list of possible axes to reference with an xref or yref attribute
 * and coerce it to that list
Expand DownExpand Up@@ -566,8 +575,9 @@ axes.calcTicks = function calcTicks(ax) {
 ax._tmin = axes.tickFirst(ax);

 // add a tiny bit so we get ticks which may have rounded out
 var startTick = rng[0] * 1.0001 - rng[1] * 0.0001;
 var endTick = rng[1] * 1.0001 - rng[0] * 0.0001;
 var exRng = expandRange(rng);
 var startTick = exRng[0];
 var endTick = exRng[1];
 // check for reversed axis
 var axrev = (rng[1] < rng[0]);

Expand DownExpand Up@@ -691,10 +701,9 @@ function arrayTicks(ax) {
 var text = ax.ticktext;
 var ticksOut = new Array(vals.length);
 var rng = Lib.simpleMap(ax.range, ax.r2l);
 var r0expanded = rng[0] * 1.0001 - rng[1] * 0.0001;
 var r1expanded = rng[1] * 1.0001 - rng[0] * 0.0001;
 var tickMin = Math.min(r0expanded, r1expanded);
 var tickMax = Math.max(r0expanded, r1expanded);
 var exRng = expandRange(rng);
 var tickMin = Math.min(exRng[0], exRng[1]);
 var tickMax = Math.max(exRng[0], exRng[1]);
 var j = 0;

 // without a text array, just format the given values as any other ticks
Expand DownExpand Up@@ -956,10 +965,21 @@ axes.tickFirst = function(ax) {
 var sRound = axrev ? Math.floor : Math.ceil;
 // add a tiny extra bit to make sure we get ticks
 // that may have been rounded out
 var r0 = rng[0] * 1.0001 - rng[1] * 0.0001;
 var r0 = expandRange(rng)[0];
 var dtick = ax.dtick;
 var tick0 = r2l(ax.tick0);

 if(ax.rangebreaks && ax.maskBreaks(tick0) === BADNUM) {
 // attempt move tick0 outside rangebreak
 for(var h = 24; h > 0; h--) {
 var delta = h * ONEHOUR;
 if(ax.maskBreaks(tick0 - delta) !== BADNUM) {
 tick0 -= delta;
 break;
 }
 }
 }

 if(isNumeric(dtick)) {
 var tmin = sRound((r0 - tick0) / dtick) * dtick + tick0;

Expand Down
Binary file modifiedtest/image/baselines/axes_breaks-gridlines.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/axes_breaks-night_autorange-reversed.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/axes_breaks-rangeslider.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedtest/image/baselines/axes_breaks-tick0-position.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modifiedtest/image/baselines/axes_breaks-weekends-weeknights.png

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

218 changes: 218 additions & 0 deletions
test/image/mocks/axes_breaks-tick0-position.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,218 @@
{
 "data": [
 {
 "type": "scatter",
 "mode": "markers",
 "x": [
 "1970-01-01T09:00:00",
 "1970-01-01T10:00:00",
 "1970-01-01T11:00:00",
 "1970-01-01T12:00:00",
 "1970-01-01T13:00:00",
 "1970-01-01T14:00:00",
 "1970-01-01T15:00:00",
 "1970-01-01T16:00:00",
 "1970-01-02T09:00:00",
 "1970-01-02T10:00:00",
 "1970-01-02T11:00:00",
 "1970-01-02T12:00:00",
 "1970-01-02T13:00:00",
 "1970-01-02T14:00:00",
 "1970-01-02T15:00:00",
 "1970-01-02T16:00:00",
 "1970-01-03T09:00:00",
 "1970-01-03T10:00:00",
 "1970-01-03T11:00:00",
 "1970-01-03T12:00:00",
 "1970-01-03T13:00:00",
 "1970-01-03T14:00:00",
 "1970-01-03T15:00:00",
 "1970-01-03T16:00:00",
 "1970-01-04T09:00:00",
 "1970-01-04T10:00:00",
 "1970-01-04T11:00:00",
 "1970-01-04T12:00:00",
 "1970-01-04T13:00:00",
 "1970-01-04T14:00:00",
 "1970-01-04T15:00:00",
 "1970-01-04T16:00:00",
 "1970-01-05T09:00:00",
 "1970-01-05T10:00:00",
 "1970-01-05T11:00:00",
 "1970-01-05T12:00:00",
 "1970-01-05T13:00:00",
 "1970-01-05T14:00:00",
 "1970-01-05T15:00:00",
 "1970-01-05T16:00:00"
 ],
 "y": [
 1,
 2,
 3,
 4,
 5,
 6,
 7,
 8,
 9,
 10,
 11,
 12,
 13,
 14,
 15,
 16,
 17,
 18,
 19,
 20,
 21,
 22,
 23,
 24,
 25,
 26,
 27,
 28,
 29,
 30,
 31,
 32,
 33,
 34,
 35,
 36,
 37,
 38,
 39,
 40
 ]
 },
 {
 "type": "scatter",
 "mode": "markers",
 "x": [
 "1970-01-01T09:00:00",
 "1970-01-01T10:00:00",
 "1970-01-01T11:00:00",
 "1970-01-01T12:00:00",
 "1970-01-01T13:00:00",
 "1970-01-01T14:00:00",
 "1970-01-01T15:00:00",
 "1970-01-01T16:00:00",
 "1970-01-02T09:00:00",
 "1970-01-02T10:00:00",
 "1970-01-02T11:00:00",
 "1970-01-02T12:00:00",
 "1970-01-02T13:00:00",
 "1970-01-02T14:00:00",
 "1970-01-02T15:00:00",
 "1970-01-02T16:00:00",
 "1970-01-03T09:00:00",
 "1970-01-03T10:00:00",
 "1970-01-03T11:00:00",
 "1970-01-03T12:00:00",
 "1970-01-03T13:00:00",
 "1970-01-03T14:00:00",
 "1970-01-03T15:00:00",
 "1970-01-03T16:00:00",
 "1970-01-04T09:00:00",
 "1970-01-04T10:00:00",
 "1970-01-04T11:00:00",
 "1970-01-04T12:00:00",
 "1970-01-04T13:00:00",
 "1970-01-04T14:00:00",
 "1970-01-04T15:00:00",
 "1970-01-04T16:00:00",
 "1970-01-05T09:00:00",
 "1970-01-05T10:00:00",
 "1970-01-05T11:00:00",
 "1970-01-05T12:00:00",
 "1970-01-05T13:00:00",
 "1970-01-05T14:00:00",
 "1970-01-05T15:00:00",
 "1970-01-05T16:00:00"
 ],
 "y": [
 1,
 2,
 3,
 4,
 5,
 6,
 7,
 8,
 9,
 10,
 11,
 12,
 13,
 14,
 15,
 16,
 17,
 18,
 19,
 20,
 21,
 22,
 23,
 24,
 25,
 26,
 27,
 28,
 29,
 30,
 31,
 32,
 33,
 34,
 35,
 36,
 37,
 38,
 39,
 40
 ],
 "xaxis": "x2",
 "yaxis": "y2"
 }
 ],
 "layout": {
 "width": 800,
 "height": 400,
 "showlegend": false,
 "xaxis": {
 "domain": [0, 0.45],
 "dtick": 86400000,
 "rangebreaks": [
 {
 "bounds": [
 17,
 9
 ],
 "pattern": "hour"
 }
 ]
 },
 "xaxis2": {
 "domain": [0.55, 1],
 "dtick": 86400000,
 "rangebreaks": [
 {
 "bounds": [
 17,
 9
 ],
 "pattern": "hour"
 }
 ],
 "autorange": "reversed",
 "anchor": "y2"
 },
 "yaxis2": {
 "anchor": "x2"
 }
 }
}