Skip to content

Handle rangebreak gaps in candlestick & ohlc#4814

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 4 commits into from
May 7, 2020
Merged

Handle rangebreak gaps in candlestick & ohlc#4814

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
615757f
improve handling of gaps in distinctVals
archmoj May 5, 2020
97f6b7b
add new mock to lock issue 4742
archmoj May 5, 2020
8a4bae3
add new candlestick mock with rangebreaks - issue 4795
archmoj May 7, 2020
2f3b098
BADNUM values sorted at the end - no need for first - tested in IE11
archmoj May 7, 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: 24 additions & 10 deletions src/lib/search.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@
var isNumeric = require('fast-isnumeric');
var loggers = require('./loggers');
var identity = require('./identity');
var BADNUM = require('../constants/numerical').BADNUM;

// don't trust floating point equality - fraction of bin size to call
// "on the line" and ensure that they go the right way specified by
Expand DownExpand Up@@ -72,22 +73,35 @@ exports.sorterDes = function(a, b) { return b - a; };
*/
exports.distinctVals = function(valsIn) {
var vals = valsIn.slice(); // otherwise we sort the original array...
vals.sort(exports.sorterAsc);
vals.sort(exports.sorterAsc); // undefined listed in the end - also works on IE11

var l = vals.length - 1;
var minDiff = (vals[l] - vals[0]) || 1;
var errDiff = minDiff / (l || 1) / 10000;
var v2 = [vals[0]];
var last;
for(last = vals.length - 1; last > -1; last--) {
if(vals[last] !== BADNUM) break;
}

var minDiff = (vals[last] - vals[0]) || 1;
var errDiff = minDiff / (last || 1) / 10000;
var newVals = [];
var preV;
for(var i = 0; i <= last; i++) {
var v = vals[i];

for(var i = 0; i < l; i++) {
// make sure values aren't just off by a rounding error
if(vals[i + 1] > vals[i] + errDiff) {
minDiff = Math.min(minDiff, vals[i + 1] - vals[i]);
v2.push(vals[i + 1]);
var diff = v - preV;

if(preV === undefined) {
newVals.push(v);
preV = v;
} else if(diff > errDiff) {
minDiff = Math.min(minDiff, diff);

newVals.push(v);
preV = v;
}
}

return {vals: v2, minDiff: minDiff};
return {vals: newVals, minDiff: minDiff};
};

/**
Expand Down
Binary file addedtest/image/baselines/axes_breaks-candlestick.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-candlestick2.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.
75 changes: 75 additions & 0 deletions test/image/mocks/axes_breaks-candlestick.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
{
"data": [
{
"type": "candlestick",
"x": [

@nicolaskruchtennicolaskruchtenMay 6, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in this mock, it would be great to see some data in the next visible range, like after 9am the next day, just to capture some of the tick labelling etc

@archmojarchmojMay 7, 2020

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. I added another mock in 8a4bae3.
And we are going to revise tick behaviour (including these mocks) in #4734 after this PR is merged.

"2020-01-02 17:00",
"2020-01-02 17:10",
"2020-01-02 17:20",
"2020-01-02 17:30",
"2020-01-02 17:40",
"2020-01-02 17:50",
"2020-01-02 18:00",
"2020-01-02 18:10"
],
"open": [
10,
10,
10,
10,
10,
10,
10,
10
],
"high": [
12,
12,
12,
12,
12,
12,
12,
14
],
"low": [
8,
8,
8,
8,
8,
8,
3,
8
],
"close": [
12,
7,
11,
10.5,
9,
8.5,
3,
14
]
}
],
"layout": {
"width": 600,
"height": 400,
"title": {
"text": "Candlestick with rangebreaks"
},
"xaxis": {
"rangebreaks": [
{
"pattern": "hour",
"bounds": [
18,
9
]
}
]
}
}
}
23 changes: 23 additions & 0 deletions test/image/mocks/axes_breaks-candlestick2.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions test/jasmine/tests/mock_test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,8 @@ var list = [
'autorange-tozero-rangemode',
'axes_booleans',
'axes_breaks',
'axes_breaks-candlestick',
'axes_breaks-candlestick2',
'axes_breaks-finance',
'axes_breaks-gridlines',
'axes_breaks-night_autorange-reversed',
Expand DownExpand Up@@ -1078,6 +1080,8 @@ figs['automargin-title-standoff'] = require('@mocks/automargin-title-standoff');
figs['autorange-tozero-rangemode'] = require('@mocks/autorange-tozero-rangemode');
// figs['axes_booleans'] = require('@mocks/axes_booleans');
figs['axes_breaks'] = require('@mocks/axes_breaks');
figs['axes_breaks-candlestick'] = require('@mocks/axes_breaks-candlestick');
figs['axes_breaks-candlestick2'] = require('@mocks/axes_breaks-candlestick2');
figs['axes_breaks-finance'] = require('@mocks/axes_breaks-finance');
figs['axes_breaks-gridlines'] = require('@mocks/axes_breaks-gridlines');
figs['axes_breaks-night_autorange-reversed'] = require('@mocks/axes_breaks-night_autorange-reversed');
Expand Down
, '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" + '
Handle rangebreak gaps in `candlestick` & `ohlc` by archmoj · Pull Request #4814 · plotly/plotly.js · GitHub
Skip to content
Handle rangebreak gaps in candlestick & ohlc#4814

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 4 commits into

from

May 7, 2020
 Merged


Handle rangebreak gaps in candlestick & ohlc#4814
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
615757f

improve handling of gaps in distinctVals


archmoj May 5, 2020
97f6b7b

add new mock to lock issue 4742


archmoj May 5, 2020
8a4bae3

add new candlestick mock with rangebreaks - issue 4795


archmoj May 7, 2020
2f3b098

BADNUM values sorted at the end - no need for first - tested in IE11


archmoj May 7, 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: 24 additions & 10 deletions
src/lib/search.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@
var isNumeric = require('fast-isnumeric');
var loggers = require('./loggers');
var identity = require('./identity');
var BADNUM = require('../constants/numerical').BADNUM;

// don't trust floating point equality - fraction of bin size to call
// "on the line" and ensure that they go the right way specified by
Expand DownExpand Up@@ -72,22 +73,35 @@ exports.sorterDes = function(a, b) { return b - a; };
 */
exports.distinctVals = function(valsIn) {
 var vals = valsIn.slice(); // otherwise we sort the original array...
 vals.sort(exports.sorterAsc);
 vals.sort(exports.sorterAsc); // undefined listed in the end - also works on IE11

 var l = vals.length - 1;
 var minDiff = (vals[l] - vals[0]) || 1;
 var errDiff = minDiff / (l || 1) / 10000;
 var v2 = [vals[0]];
 var last;
 for(last = vals.length - 1; last > -1; last--) {
 if(vals[last] !== BADNUM) break;
 }

 var minDiff = (vals[last] - vals[0]) || 1;
 var errDiff = minDiff / (last || 1) / 10000;
 var newVals = [];
 var preV;
 for(var i = 0; i <= last; i++) {
 var v = vals[i];

 for(var i = 0; i < l; i++) {
 // make sure values aren't just off by a rounding error
 if(vals[i + 1] > vals[i] + errDiff) {
 minDiff = Math.min(minDiff, vals[i + 1] - vals[i]);
 v2.push(vals[i + 1]);
 var diff = v - preV;

 if(preV === undefined) {
 newVals.push(v);
 preV = v;
 } else if(diff > errDiff) {
 minDiff = Math.min(minDiff, diff);

 newVals.push(v);
 preV = v;
 }
 }

 return {vals: v2, minDiff: minDiff};
 return {vals: newVals, minDiff: minDiff};
};

/**
Expand Down
Binary file addedtest/image/baselines/axes_breaks-candlestick.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-candlestick2.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.

75 changes: 75 additions & 0 deletions
test/image/mocks/axes_breaks-candlestick.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
{
 "data": [
 {
 "type": "candlestick",
 "x": [
@nicolaskruchtennicolaskruchtenMay 6, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in this mock, it would be great to see some data in the next visible range, like after 9am the next day, just to capture some of the tick labelling etc
@archmojarchmojMay 7, 2020

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. I added another mock in 8a4bae3.

And we are going to revise tick behaviour (including these mocks) in #4734 after this PR is merged.
 "2020-01-02 17:00",
 "2020-01-02 17:10",
 "2020-01-02 17:20",
 "2020-01-02 17:30",
 "2020-01-02 17:40",
 "2020-01-02 17:50",
 "2020-01-02 18:00",
 "2020-01-02 18:10"
 ],
 "open": [
 10,
 10,
 10,
 10,
 10,
 10,
 10,
 10
 ],
 "high": [
 12,
 12,
 12,
 12,
 12,
 12,
 12,
 14
 ],
 "low": [
 8,
 8,
 8,
 8,
 8,
 8,
 3,
 8
 ],
 "close": [
 12,
 7,
 11,
 10.5,
 9,
 8.5,
 3,
 14
 ]
 }
 ],
 "layout": {
 "width": 600,
 "height": 400,
 "title": {
 "text": "Candlestick with rangebreaks"
 },
 "xaxis": {
 "rangebreaks": [
 {
 "pattern": "hour",
 "bounds": [
 18,
 9
 ]
 }
 ]
 }
 }
}

23 changes: 23 additions & 0 deletions
test/image/mocks/axes_breaks-candlestick2.json

View file


Open in desktop


Large diffs are not rendered by default.


4 changes: 4 additions & 0 deletions
test/jasmine/tests/mock_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,8 @@ var list = [
 'autorange-tozero-rangemode',
 'axes_booleans',
 'axes_breaks',
 'axes_breaks-candlestick',
 'axes_breaks-candlestick2',
 'axes_breaks-finance',
 'axes_breaks-gridlines',
 'axes_breaks-night_autorange-reversed',
Expand DownExpand Up@@ -1078,6 +1080,8 @@ figs['automargin-title-standoff'] = require('@mocks/automargin-title-standoff');
figs['autorange-tozero-rangemode'] = require('@mocks/autorange-tozero-rangemode');
// figs['axes_booleans'] = require('@mocks/axes_booleans');
figs['axes_breaks'] = require('@mocks/axes_breaks');
figs['axes_breaks-candlestick'] = require('@mocks/axes_breaks-candlestick');
figs['axes_breaks-candlestick2'] = require('@mocks/axes_breaks-candlestick2');
figs['axes_breaks-finance'] = require('@mocks/axes_breaks-finance');
figs['axes_breaks-gridlines'] = require('@mocks/axes_breaks-gridlines');
figs['axes_breaks-night_autorange-reversed'] = require('@mocks/axes_breaks-night_autorange-reversed');
Expand Down

, '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('^' + ".*" + '
Handle rangebreak gaps in `candlestick` & `ohlc` by archmoj · Pull Request #4814 · plotly/plotly.js · GitHub
Skip to content
Handle rangebreak gaps in candlestick & ohlc#4814

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 4 commits into

from

May 7, 2020
 Merged


Handle rangebreak gaps in candlestick & ohlc#4814
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
615757f

improve handling of gaps in distinctVals


archmoj May 5, 2020
97f6b7b

add new mock to lock issue 4742


archmoj May 5, 2020
8a4bae3

add new candlestick mock with rangebreaks - issue 4795


archmoj May 7, 2020
2f3b098

BADNUM values sorted at the end - no need for first - tested in IE11


archmoj May 7, 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: 24 additions & 10 deletions
src/lib/search.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@
var isNumeric = require('fast-isnumeric');
var loggers = require('./loggers');
var identity = require('./identity');
var BADNUM = require('../constants/numerical').BADNUM;

// don't trust floating point equality - fraction of bin size to call
// "on the line" and ensure that they go the right way specified by
Expand DownExpand Up@@ -72,22 +73,35 @@ exports.sorterDes = function(a, b) { return b - a; };
 */
exports.distinctVals = function(valsIn) {
 var vals = valsIn.slice(); // otherwise we sort the original array...
 vals.sort(exports.sorterAsc);
 vals.sort(exports.sorterAsc); // undefined listed in the end - also works on IE11

 var l = vals.length - 1;
 var minDiff = (vals[l] - vals[0]) || 1;
 var errDiff = minDiff / (l || 1) / 10000;
 var v2 = [vals[0]];
 var last;
 for(last = vals.length - 1; last > -1; last--) {
 if(vals[last] !== BADNUM) break;
 }

 var minDiff = (vals[last] - vals[0]) || 1;
 var errDiff = minDiff / (last || 1) / 10000;
 var newVals = [];
 var preV;
 for(var i = 0; i <= last; i++) {
 var v = vals[i];

 for(var i = 0; i < l; i++) {
 // make sure values aren't just off by a rounding error
 if(vals[i + 1] > vals[i] + errDiff) {
 minDiff = Math.min(minDiff, vals[i + 1] - vals[i]);
 v2.push(vals[i + 1]);
 var diff = v - preV;

 if(preV === undefined) {
 newVals.push(v);
 preV = v;
 } else if(diff > errDiff) {
 minDiff = Math.min(minDiff, diff);

 newVals.push(v);
 preV = v;
 }
 }

 return {vals: v2, minDiff: minDiff};
 return {vals: newVals, minDiff: minDiff};
};

/**
Expand Down
Binary file addedtest/image/baselines/axes_breaks-candlestick.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-candlestick2.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.

75 changes: 75 additions & 0 deletions
test/image/mocks/axes_breaks-candlestick.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
{
 "data": [
 {
 "type": "candlestick",
 "x": [
@nicolaskruchtennicolaskruchtenMay 6, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in this mock, it would be great to see some data in the next visible range, like after 9am the next day, just to capture some of the tick labelling etc
@archmojarchmojMay 7, 2020

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. I added another mock in 8a4bae3.

And we are going to revise tick behaviour (including these mocks) in #4734 after this PR is merged.
 "2020-01-02 17:00",
 "2020-01-02 17:10",
 "2020-01-02 17:20",
 "2020-01-02 17:30",
 "2020-01-02 17:40",
 "2020-01-02 17:50",
 "2020-01-02 18:00",
 "2020-01-02 18:10"
 ],
 "open": [
 10,
 10,
 10,
 10,
 10,
 10,
 10,
 10
 ],
 "high": [
 12,
 12,
 12,
 12,
 12,
 12,
 12,
 14
 ],
 "low": [
 8,
 8,
 8,
 8,
 8,
 8,
 3,
 8
 ],
 "close": [
 12,
 7,
 11,
 10.5,
 9,
 8.5,
 3,
 14
 ]
 }
 ],
 "layout": {
 "width": 600,
 "height": 400,
 "title": {
 "text": "Candlestick with rangebreaks"
 },
 "xaxis": {
 "rangebreaks": [
 {
 "pattern": "hour",
 "bounds": [
 18,
 9
 ]
 }
 ]
 }
 }
}

23 changes: 23 additions & 0 deletions
test/image/mocks/axes_breaks-candlestick2.json

View file


Open in desktop


Large diffs are not rendered by default.


4 changes: 4 additions & 0 deletions
test/jasmine/tests/mock_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,8 @@ var list = [
 'autorange-tozero-rangemode',
 'axes_booleans',
 'axes_breaks',
 'axes_breaks-candlestick',
 'axes_breaks-candlestick2',
 'axes_breaks-finance',
 'axes_breaks-gridlines',
 'axes_breaks-night_autorange-reversed',
Expand DownExpand Up@@ -1078,6 +1080,8 @@ figs['automargin-title-standoff'] = require('@mocks/automargin-title-standoff');
figs['autorange-tozero-rangemode'] = require('@mocks/autorange-tozero-rangemode');
// figs['axes_booleans'] = require('@mocks/axes_booleans');
figs['axes_breaks'] = require('@mocks/axes_breaks');
figs['axes_breaks-candlestick'] = require('@mocks/axes_breaks-candlestick');
figs['axes_breaks-candlestick2'] = require('@mocks/axes_breaks-candlestick2');
figs['axes_breaks-finance'] = require('@mocks/axes_breaks-finance');
figs['axes_breaks-gridlines'] = require('@mocks/axes_breaks-gridlines');
figs['axes_breaks-night_autorange-reversed'] = require('@mocks/axes_breaks-night_autorange-reversed');
Expand Down

, '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('^' + ".*" + '
Handle rangebreak gaps in `candlestick` & `ohlc` by archmoj · Pull Request #4814 · plotly/plotly.js · GitHub
Skip to content
Handle rangebreak gaps in candlestick & ohlc#4814

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 4 commits into

from

May 7, 2020
 Merged


Handle rangebreak gaps in candlestick & ohlc#4814
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
615757f

improve handling of gaps in distinctVals


archmoj May 5, 2020
97f6b7b

add new mock to lock issue 4742


archmoj May 5, 2020
8a4bae3

add new candlestick mock with rangebreaks - issue 4795


archmoj May 7, 2020
2f3b098

BADNUM values sorted at the end - no need for first - tested in IE11


archmoj May 7, 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: 24 additions & 10 deletions
src/lib/search.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@
var isNumeric = require('fast-isnumeric');
var loggers = require('./loggers');
var identity = require('./identity');
var BADNUM = require('../constants/numerical').BADNUM;

// don't trust floating point equality - fraction of bin size to call
// "on the line" and ensure that they go the right way specified by
Expand DownExpand Up@@ -72,22 +73,35 @@ exports.sorterDes = function(a, b) { return b - a; };
 */
exports.distinctVals = function(valsIn) {
 var vals = valsIn.slice(); // otherwise we sort the original array...
 vals.sort(exports.sorterAsc);
 vals.sort(exports.sorterAsc); // undefined listed in the end - also works on IE11

 var l = vals.length - 1;
 var minDiff = (vals[l] - vals[0]) || 1;
 var errDiff = minDiff / (l || 1) / 10000;
 var v2 = [vals[0]];
 var last;
 for(last = vals.length - 1; last > -1; last--) {
 if(vals[last] !== BADNUM) break;
 }

 var minDiff = (vals[last] - vals[0]) || 1;
 var errDiff = minDiff / (last || 1) / 10000;
 var newVals = [];
 var preV;
 for(var i = 0; i <= last; i++) {
 var v = vals[i];

 for(var i = 0; i < l; i++) {
 // make sure values aren't just off by a rounding error
 if(vals[i + 1] > vals[i] + errDiff) {
 minDiff = Math.min(minDiff, vals[i + 1] - vals[i]);
 v2.push(vals[i + 1]);
 var diff = v - preV;

 if(preV === undefined) {
 newVals.push(v);
 preV = v;
 } else if(diff > errDiff) {
 minDiff = Math.min(minDiff, diff);

 newVals.push(v);
 preV = v;
 }
 }

 return {vals: v2, minDiff: minDiff};
 return {vals: newVals, minDiff: minDiff};
};

/**
Expand Down
Binary file addedtest/image/baselines/axes_breaks-candlestick.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-candlestick2.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.

75 changes: 75 additions & 0 deletions
test/image/mocks/axes_breaks-candlestick.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
{
 "data": [
 {
 "type": "candlestick",
 "x": [
@nicolaskruchtennicolaskruchtenMay 6, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in this mock, it would be great to see some data in the next visible range, like after 9am the next day, just to capture some of the tick labelling etc
@archmojarchmojMay 7, 2020

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. I added another mock in 8a4bae3.

And we are going to revise tick behaviour (including these mocks) in #4734 after this PR is merged.
 "2020-01-02 17:00",
 "2020-01-02 17:10",
 "2020-01-02 17:20",
 "2020-01-02 17:30",
 "2020-01-02 17:40",
 "2020-01-02 17:50",
 "2020-01-02 18:00",
 "2020-01-02 18:10"
 ],
 "open": [
 10,
 10,
 10,
 10,
 10,
 10,
 10,
 10
 ],
 "high": [
 12,
 12,
 12,
 12,
 12,
 12,
 12,
 14
 ],
 "low": [
 8,
 8,
 8,
 8,
 8,
 8,
 3,
 8
 ],
 "close": [
 12,
 7,
 11,
 10.5,
 9,
 8.5,
 3,
 14
 ]
 }
 ],
 "layout": {
 "width": 600,
 "height": 400,
 "title": {
 "text": "Candlestick with rangebreaks"
 },
 "xaxis": {
 "rangebreaks": [
 {
 "pattern": "hour",
 "bounds": [
 18,
 9
 ]
 }
 ]
 }
 }
}

23 changes: 23 additions & 0 deletions
test/image/mocks/axes_breaks-candlestick2.json

View file


Open in desktop


Large diffs are not rendered by default.


4 changes: 4 additions & 0 deletions
test/jasmine/tests/mock_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,8 @@ var list = [
 'autorange-tozero-rangemode',
 'axes_booleans',
 'axes_breaks',
 'axes_breaks-candlestick',
 'axes_breaks-candlestick2',
 'axes_breaks-finance',
 'axes_breaks-gridlines',
 'axes_breaks-night_autorange-reversed',
Expand DownExpand Up@@ -1078,6 +1080,8 @@ figs['automargin-title-standoff'] = require('@mocks/automargin-title-standoff');
figs['autorange-tozero-rangemode'] = require('@mocks/autorange-tozero-rangemode');
// figs['axes_booleans'] = require('@mocks/axes_booleans');
figs['axes_breaks'] = require('@mocks/axes_breaks');
figs['axes_breaks-candlestick'] = require('@mocks/axes_breaks-candlestick');
figs['axes_breaks-candlestick2'] = require('@mocks/axes_breaks-candlestick2');
figs['axes_breaks-finance'] = require('@mocks/axes_breaks-finance');
figs['axes_breaks-gridlines'] = require('@mocks/axes_breaks-gridlines');
figs['axes_breaks-night_autorange-reversed'] = require('@mocks/axes_breaks-night_autorange-reversed');
Expand Down

, '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" + '
Handle rangebreak gaps in `candlestick` & `ohlc` by archmoj · Pull Request #4814 · plotly/plotly.js · GitHub
Skip to content
Handle rangebreak gaps in candlestick & ohlc#4814

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 4 commits into

from

May 7, 2020
 Merged


Handle rangebreak gaps in candlestick & ohlc#4814
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
615757f

improve handling of gaps in distinctVals


archmoj May 5, 2020
97f6b7b

add new mock to lock issue 4742


archmoj May 5, 2020
8a4bae3

add new candlestick mock with rangebreaks - issue 4795


archmoj May 7, 2020
2f3b098

BADNUM values sorted at the end - no need for first - tested in IE11


archmoj May 7, 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: 24 additions & 10 deletions
src/lib/search.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@
var isNumeric = require('fast-isnumeric');
var loggers = require('./loggers');
var identity = require('./identity');
var BADNUM = require('../constants/numerical').BADNUM;

// don't trust floating point equality - fraction of bin size to call
// "on the line" and ensure that they go the right way specified by
Expand DownExpand Up@@ -72,22 +73,35 @@ exports.sorterDes = function(a, b) { return b - a; };
 */
exports.distinctVals = function(valsIn) {
 var vals = valsIn.slice(); // otherwise we sort the original array...
 vals.sort(exports.sorterAsc);
 vals.sort(exports.sorterAsc); // undefined listed in the end - also works on IE11

 var l = vals.length - 1;
 var minDiff = (vals[l] - vals[0]) || 1;
 var errDiff = minDiff / (l || 1) / 10000;
 var v2 = [vals[0]];
 var last;
 for(last = vals.length - 1; last > -1; last--) {
 if(vals[last] !== BADNUM) break;
 }

 var minDiff = (vals[last] - vals[0]) || 1;
 var errDiff = minDiff / (last || 1) / 10000;
 var newVals = [];
 var preV;
 for(var i = 0; i <= last; i++) {
 var v = vals[i];

 for(var i = 0; i < l; i++) {
 // make sure values aren't just off by a rounding error
 if(vals[i + 1] > vals[i] + errDiff) {
 minDiff = Math.min(minDiff, vals[i + 1] - vals[i]);
 v2.push(vals[i + 1]);
 var diff = v - preV;

 if(preV === undefined) {
 newVals.push(v);
 preV = v;
 } else if(diff > errDiff) {
 minDiff = Math.min(minDiff, diff);

 newVals.push(v);
 preV = v;
 }
 }

 return {vals: v2, minDiff: minDiff};
 return {vals: newVals, minDiff: minDiff};
};

/**
Expand Down
Binary file addedtest/image/baselines/axes_breaks-candlestick.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-candlestick2.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.

75 changes: 75 additions & 0 deletions
test/image/mocks/axes_breaks-candlestick.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
{
 "data": [
 {
 "type": "candlestick",
 "x": [
@nicolaskruchtennicolaskruchtenMay 6, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in this mock, it would be great to see some data in the next visible range, like after 9am the next day, just to capture some of the tick labelling etc
@archmojarchmojMay 7, 2020

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. I added another mock in 8a4bae3.

And we are going to revise tick behaviour (including these mocks) in #4734 after this PR is merged.
 "2020-01-02 17:00",
 "2020-01-02 17:10",
 "2020-01-02 17:20",
 "2020-01-02 17:30",
 "2020-01-02 17:40",
 "2020-01-02 17:50",
 "2020-01-02 18:00",
 "2020-01-02 18:10"
 ],
 "open": [
 10,
 10,
 10,
 10,
 10,
 10,
 10,
 10
 ],
 "high": [
 12,
 12,
 12,
 12,
 12,
 12,
 12,
 14
 ],
 "low": [
 8,
 8,
 8,
 8,
 8,
 8,
 3,
 8
 ],
 "close": [
 12,
 7,
 11,
 10.5,
 9,
 8.5,
 3,
 14
 ]
 }
 ],
 "layout": {
 "width": 600,
 "height": 400,
 "title": {
 "text": "Candlestick with rangebreaks"
 },
 "xaxis": {
 "rangebreaks": [
 {
 "pattern": "hour",
 "bounds": [
 18,
 9
 ]
 }
 ]
 }
 }
}

23 changes: 23 additions & 0 deletions
test/image/mocks/axes_breaks-candlestick2.json

View file


Open in desktop


Large diffs are not rendered by default.


4 changes: 4 additions & 0 deletions
test/jasmine/tests/mock_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,8 @@ var list = [
 'autorange-tozero-rangemode',
 'axes_booleans',
 'axes_breaks',
 'axes_breaks-candlestick',
 'axes_breaks-candlestick2',
 'axes_breaks-finance',
 'axes_breaks-gridlines',
 'axes_breaks-night_autorange-reversed',
Expand DownExpand Up@@ -1078,6 +1080,8 @@ figs['automargin-title-standoff'] = require('@mocks/automargin-title-standoff');
figs['autorange-tozero-rangemode'] = require('@mocks/autorange-tozero-rangemode');
// figs['axes_booleans'] = require('@mocks/axes_booleans');
figs['axes_breaks'] = require('@mocks/axes_breaks');
figs['axes_breaks-candlestick'] = require('@mocks/axes_breaks-candlestick');
figs['axes_breaks-candlestick2'] = require('@mocks/axes_breaks-candlestick2');
figs['axes_breaks-finance'] = require('@mocks/axes_breaks-finance');
figs['axes_breaks-gridlines'] = require('@mocks/axes_breaks-gridlines');
figs['axes_breaks-night_autorange-reversed'] = require('@mocks/axes_breaks-night_autorange-reversed');
Expand Down

, '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('^' + ".*" + '
Handle rangebreak gaps in `candlestick` & `ohlc` by archmoj · Pull Request #4814 · plotly/plotly.js · GitHub
Skip to content
Handle rangebreak gaps in candlestick & ohlc#4814

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 4 commits into

from

May 7, 2020
 Merged


Handle rangebreak gaps in candlestick & ohlc#4814
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
615757f

improve handling of gaps in distinctVals


archmoj May 5, 2020
97f6b7b

add new mock to lock issue 4742


archmoj May 5, 2020
8a4bae3

add new candlestick mock with rangebreaks - issue 4795


archmoj May 7, 2020
2f3b098

BADNUM values sorted at the end - no need for first - tested in IE11


archmoj May 7, 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: 24 additions & 10 deletions
src/lib/search.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@
var isNumeric = require('fast-isnumeric');
var loggers = require('./loggers');
var identity = require('./identity');
var BADNUM = require('../constants/numerical').BADNUM;

// don't trust floating point equality - fraction of bin size to call
// "on the line" and ensure that they go the right way specified by
Expand DownExpand Up@@ -72,22 +73,35 @@ exports.sorterDes = function(a, b) { return b - a; };
 */
exports.distinctVals = function(valsIn) {
 var vals = valsIn.slice(); // otherwise we sort the original array...
 vals.sort(exports.sorterAsc);
 vals.sort(exports.sorterAsc); // undefined listed in the end - also works on IE11

 var l = vals.length - 1;
 var minDiff = (vals[l] - vals[0]) || 1;
 var errDiff = minDiff / (l || 1) / 10000;
 var v2 = [vals[0]];
 var last;
 for(last = vals.length - 1; last > -1; last--) {
 if(vals[last] !== BADNUM) break;
 }

 var minDiff = (vals[last] - vals[0]) || 1;
 var errDiff = minDiff / (last || 1) / 10000;
 var newVals = [];
 var preV;
 for(var i = 0; i <= last; i++) {
 var v = vals[i];

 for(var i = 0; i < l; i++) {
 // make sure values aren't just off by a rounding error
 if(vals[i + 1] > vals[i] + errDiff) {
 minDiff = Math.min(minDiff, vals[i + 1] - vals[i]);
 v2.push(vals[i + 1]);
 var diff = v - preV;

 if(preV === undefined) {
 newVals.push(v);
 preV = v;
 } else if(diff > errDiff) {
 minDiff = Math.min(minDiff, diff);

 newVals.push(v);
 preV = v;
 }
 }

 return {vals: v2, minDiff: minDiff};
 return {vals: newVals, minDiff: minDiff};
};

/**
Expand Down
Binary file addedtest/image/baselines/axes_breaks-candlestick.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-candlestick2.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.

75 changes: 75 additions & 0 deletions
test/image/mocks/axes_breaks-candlestick.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
{
 "data": [
 {
 "type": "candlestick",
 "x": [
@nicolaskruchtennicolaskruchtenMay 6, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in this mock, it would be great to see some data in the next visible range, like after 9am the next day, just to capture some of the tick labelling etc
@archmojarchmojMay 7, 2020

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. I added another mock in 8a4bae3.

And we are going to revise tick behaviour (including these mocks) in #4734 after this PR is merged.
 "2020-01-02 17:00",
 "2020-01-02 17:10",
 "2020-01-02 17:20",
 "2020-01-02 17:30",
 "2020-01-02 17:40",
 "2020-01-02 17:50",
 "2020-01-02 18:00",
 "2020-01-02 18:10"
 ],
 "open": [
 10,
 10,
 10,
 10,
 10,
 10,
 10,
 10
 ],
 "high": [
 12,
 12,
 12,
 12,
 12,
 12,
 12,
 14
 ],
 "low": [
 8,
 8,
 8,
 8,
 8,
 8,
 3,
 8
 ],
 "close": [
 12,
 7,
 11,
 10.5,
 9,
 8.5,
 3,
 14
 ]
 }
 ],
 "layout": {
 "width": 600,
 "height": 400,
 "title": {
 "text": "Candlestick with rangebreaks"
 },
 "xaxis": {
 "rangebreaks": [
 {
 "pattern": "hour",
 "bounds": [
 18,
 9
 ]
 }
 ]
 }
 }
}

23 changes: 23 additions & 0 deletions
test/image/mocks/axes_breaks-candlestick2.json

View file


Open in desktop


Large diffs are not rendered by default.


4 changes: 4 additions & 0 deletions
test/jasmine/tests/mock_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,8 @@ var list = [
 'autorange-tozero-rangemode',
 'axes_booleans',
 'axes_breaks',
 'axes_breaks-candlestick',
 'axes_breaks-candlestick2',
 'axes_breaks-finance',
 'axes_breaks-gridlines',
 'axes_breaks-night_autorange-reversed',
Expand DownExpand Up@@ -1078,6 +1080,8 @@ figs['automargin-title-standoff'] = require('@mocks/automargin-title-standoff');
figs['autorange-tozero-rangemode'] = require('@mocks/autorange-tozero-rangemode');
// figs['axes_booleans'] = require('@mocks/axes_booleans');
figs['axes_breaks'] = require('@mocks/axes_breaks');
figs['axes_breaks-candlestick'] = require('@mocks/axes_breaks-candlestick');
figs['axes_breaks-candlestick2'] = require('@mocks/axes_breaks-candlestick2');
figs['axes_breaks-finance'] = require('@mocks/axes_breaks-finance');
figs['axes_breaks-gridlines'] = require('@mocks/axes_breaks-gridlines');
figs['axes_breaks-night_autorange-reversed'] = require('@mocks/axes_breaks-night_autorange-reversed');
Expand Down

, '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('^' + ".*" + '
Handle rangebreak gaps in `candlestick` & `ohlc` by archmoj · Pull Request #4814 · plotly/plotly.js · GitHub
Skip to content
Handle rangebreak gaps in candlestick & ohlc#4814

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 4 commits into

from

May 7, 2020
 Merged


Handle rangebreak gaps in candlestick & ohlc#4814
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
615757f

improve handling of gaps in distinctVals


archmoj May 5, 2020
97f6b7b

add new mock to lock issue 4742


archmoj May 5, 2020
8a4bae3

add new candlestick mock with rangebreaks - issue 4795


archmoj May 7, 2020
2f3b098

BADNUM values sorted at the end - no need for first - tested in IE11


archmoj May 7, 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: 24 additions & 10 deletions
src/lib/search.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@
var isNumeric = require('fast-isnumeric');
var loggers = require('./loggers');
var identity = require('./identity');
var BADNUM = require('../constants/numerical').BADNUM;

// don't trust floating point equality - fraction of bin size to call
// "on the line" and ensure that they go the right way specified by
Expand DownExpand Up@@ -72,22 +73,35 @@ exports.sorterDes = function(a, b) { return b - a; };
 */
exports.distinctVals = function(valsIn) {
 var vals = valsIn.slice(); // otherwise we sort the original array...
 vals.sort(exports.sorterAsc);
 vals.sort(exports.sorterAsc); // undefined listed in the end - also works on IE11

 var l = vals.length - 1;
 var minDiff = (vals[l] - vals[0]) || 1;
 var errDiff = minDiff / (l || 1) / 10000;
 var v2 = [vals[0]];
 var last;
 for(last = vals.length - 1; last > -1; last--) {
 if(vals[last] !== BADNUM) break;
 }

 var minDiff = (vals[last] - vals[0]) || 1;
 var errDiff = minDiff / (last || 1) / 10000;
 var newVals = [];
 var preV;
 for(var i = 0; i <= last; i++) {
 var v = vals[i];

 for(var i = 0; i < l; i++) {
 // make sure values aren't just off by a rounding error
 if(vals[i + 1] > vals[i] + errDiff) {
 minDiff = Math.min(minDiff, vals[i + 1] - vals[i]);
 v2.push(vals[i + 1]);
 var diff = v - preV;

 if(preV === undefined) {
 newVals.push(v);
 preV = v;
 } else if(diff > errDiff) {
 minDiff = Math.min(minDiff, diff);

 newVals.push(v);
 preV = v;
 }
 }

 return {vals: v2, minDiff: minDiff};
 return {vals: newVals, minDiff: minDiff};
};

/**
Expand Down
Binary file addedtest/image/baselines/axes_breaks-candlestick.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-candlestick2.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.

75 changes: 75 additions & 0 deletions
test/image/mocks/axes_breaks-candlestick.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
{
 "data": [
 {
 "type": "candlestick",
 "x": [
@nicolaskruchtennicolaskruchtenMay 6, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in this mock, it would be great to see some data in the next visible range, like after 9am the next day, just to capture some of the tick labelling etc
@archmojarchmojMay 7, 2020

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. I added another mock in 8a4bae3.

And we are going to revise tick behaviour (including these mocks) in #4734 after this PR is merged.
 "2020-01-02 17:00",
 "2020-01-02 17:10",
 "2020-01-02 17:20",
 "2020-01-02 17:30",
 "2020-01-02 17:40",
 "2020-01-02 17:50",
 "2020-01-02 18:00",
 "2020-01-02 18:10"
 ],
 "open": [
 10,
 10,
 10,
 10,
 10,
 10,
 10,
 10
 ],
 "high": [
 12,
 12,
 12,
 12,
 12,
 12,
 12,
 14
 ],
 "low": [
 8,
 8,
 8,
 8,
 8,
 8,
 3,
 8
 ],
 "close": [
 12,
 7,
 11,
 10.5,
 9,
 8.5,
 3,
 14
 ]
 }
 ],
 "layout": {
 "width": 600,
 "height": 400,
 "title": {
 "text": "Candlestick with rangebreaks"
 },
 "xaxis": {
 "rangebreaks": [
 {
 "pattern": "hour",
 "bounds": [
 18,
 9
 ]
 }
 ]
 }
 }
}

23 changes: 23 additions & 0 deletions
test/image/mocks/axes_breaks-candlestick2.json

View file


Open in desktop


Large diffs are not rendered by default.


4 changes: 4 additions & 0 deletions
test/jasmine/tests/mock_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,8 @@ var list = [
 'autorange-tozero-rangemode',
 'axes_booleans',
 'axes_breaks',
 'axes_breaks-candlestick',
 'axes_breaks-candlestick2',
 'axes_breaks-finance',
 'axes_breaks-gridlines',
 'axes_breaks-night_autorange-reversed',
Expand DownExpand Up@@ -1078,6 +1080,8 @@ figs['automargin-title-standoff'] = require('@mocks/automargin-title-standoff');
figs['autorange-tozero-rangemode'] = require('@mocks/autorange-tozero-rangemode');
// figs['axes_booleans'] = require('@mocks/axes_booleans');
figs['axes_breaks'] = require('@mocks/axes_breaks');
figs['axes_breaks-candlestick'] = require('@mocks/axes_breaks-candlestick');
figs['axes_breaks-candlestick2'] = require('@mocks/axes_breaks-candlestick2');
figs['axes_breaks-finance'] = require('@mocks/axes_breaks-finance');
figs['axes_breaks-gridlines'] = require('@mocks/axes_breaks-gridlines');
figs['axes_breaks-night_autorange-reversed'] = require('@mocks/axes_breaks-night_autorange-reversed');
Expand Down

, '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); }
})();
})();
Handle rangebreak gaps in `candlestick` & `ohlc` by archmoj · Pull Request #4814 · plotly/plotly.js · GitHub
Skip to content
Handle rangebreak gaps in candlestick & ohlc#4814

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 4 commits into

from

May 7, 2020
 Merged


Handle rangebreak gaps in candlestick & ohlc#4814
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
615757f

improve handling of gaps in distinctVals


archmoj May 5, 2020
97f6b7b

add new mock to lock issue 4742


archmoj May 5, 2020
8a4bae3

add new candlestick mock with rangebreaks - issue 4795


archmoj May 7, 2020
2f3b098

BADNUM values sorted at the end - no need for first - tested in IE11


archmoj May 7, 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: 24 additions & 10 deletions
src/lib/search.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@
var isNumeric = require('fast-isnumeric');
var loggers = require('./loggers');
var identity = require('./identity');
var BADNUM = require('../constants/numerical').BADNUM;

// don't trust floating point equality - fraction of bin size to call
// "on the line" and ensure that they go the right way specified by
Expand DownExpand Up@@ -72,22 +73,35 @@ exports.sorterDes = function(a, b) { return b - a; };
 */
exports.distinctVals = function(valsIn) {
 var vals = valsIn.slice(); // otherwise we sort the original array...
 vals.sort(exports.sorterAsc);
 vals.sort(exports.sorterAsc); // undefined listed in the end - also works on IE11

 var l = vals.length - 1;
 var minDiff = (vals[l] - vals[0]) || 1;
 var errDiff = minDiff / (l || 1) / 10000;
 var v2 = [vals[0]];
 var last;
 for(last = vals.length - 1; last > -1; last--) {
 if(vals[last] !== BADNUM) break;
 }

 var minDiff = (vals[last] - vals[0]) || 1;
 var errDiff = minDiff / (last || 1) / 10000;
 var newVals = [];
 var preV;
 for(var i = 0; i <= last; i++) {
 var v = vals[i];

 for(var i = 0; i < l; i++) {
 // make sure values aren't just off by a rounding error
 if(vals[i + 1] > vals[i] + errDiff) {
 minDiff = Math.min(minDiff, vals[i + 1] - vals[i]);
 v2.push(vals[i + 1]);
 var diff = v - preV;

 if(preV === undefined) {
 newVals.push(v);
 preV = v;
 } else if(diff > errDiff) {
 minDiff = Math.min(minDiff, diff);

 newVals.push(v);
 preV = v;
 }
 }

 return {vals: v2, minDiff: minDiff};
 return {vals: newVals, minDiff: minDiff};
};

/**
Expand Down
Binary file addedtest/image/baselines/axes_breaks-candlestick.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-candlestick2.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.

75 changes: 75 additions & 0 deletions
test/image/mocks/axes_breaks-candlestick.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
{
 "data": [
 {
 "type": "candlestick",
 "x": [
@nicolaskruchtennicolaskruchtenMay 6, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in this mock, it would be great to see some data in the next visible range, like after 9am the next day, just to capture some of the tick labelling etc
@archmojarchmojMay 7, 2020

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. I added another mock in 8a4bae3.

And we are going to revise tick behaviour (including these mocks) in #4734 after this PR is merged.
 "2020-01-02 17:00",
 "2020-01-02 17:10",
 "2020-01-02 17:20",
 "2020-01-02 17:30",
 "2020-01-02 17:40",
 "2020-01-02 17:50",
 "2020-01-02 18:00",
 "2020-01-02 18:10"
 ],
 "open": [
 10,
 10,
 10,
 10,
 10,
 10,
 10,
 10
 ],
 "high": [
 12,
 12,
 12,
 12,
 12,
 12,
 12,
 14
 ],
 "low": [
 8,
 8,
 8,
 8,
 8,
 8,
 3,
 8
 ],
 "close": [
 12,
 7,
 11,
 10.5,
 9,
 8.5,
 3,
 14
 ]
 }
 ],
 "layout": {
 "width": 600,
 "height": 400,
 "title": {
 "text": "Candlestick with rangebreaks"
 },
 "xaxis": {
 "rangebreaks": [
 {
 "pattern": "hour",
 "bounds": [
 18,
 9
 ]
 }
 ]
 }
 }
}

23 changes: 23 additions & 0 deletions
test/image/mocks/axes_breaks-candlestick2.json

View file


Open in desktop


Large diffs are not rendered by default.


4 changes: 4 additions & 0 deletions
test/jasmine/tests/mock_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,8 @@ var list = [
 'autorange-tozero-rangemode',
 'axes_booleans',
 'axes_breaks',
 'axes_breaks-candlestick',
 'axes_breaks-candlestick2',
 'axes_breaks-finance',
 'axes_breaks-gridlines',
 'axes_breaks-night_autorange-reversed',
Expand DownExpand Up@@ -1078,6 +1080,8 @@ figs['automargin-title-standoff'] = require('@mocks/automargin-title-standoff');
figs['autorange-tozero-rangemode'] = require('@mocks/autorange-tozero-rangemode');
// figs['axes_booleans'] = require('@mocks/axes_booleans');
figs['axes_breaks'] = require('@mocks/axes_breaks');
figs['axes_breaks-candlestick'] = require('@mocks/axes_breaks-candlestick');
figs['axes_breaks-candlestick2'] = require('@mocks/axes_breaks-candlestick2');
figs['axes_breaks-finance'] = require('@mocks/axes_breaks-finance');
figs['axes_breaks-gridlines'] = require('@mocks/axes_breaks-gridlines');
figs['axes_breaks-night_autorange-reversed'] = require('@mocks/axes_breaks-night_autorange-reversed');
Expand Down