Skip to content

Fix rangebreaks on heatmap with 2d z array#4821

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

Fix rangebreaks on heatmap with 2d z array #4821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
de4ff4f
refactor heatmap convertColumnData
archmoj May 7, 2020
e85b04c
add heatmap rangebreak mocks with 1d & 2d z arrays
archmoj May 7, 2020
9051ab6
remove BADNUMs i.e. rangebreak gaps from heatmap trace.x & y and drop…
archmoj May 7, 2020
5f5f92d
correct baseline of heatmap with 2d-z-array
archmoj May 7, 2020
e2cf395
extend mock data to next day over the break
archmoj May 8, 2020
a7676bd
add tests for coutour with rangebreaks & 1d and 2d z array
archmoj May 11, 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
33 changes: 33 additions & 0 deletions src/traces/heatmap/calc.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ var clean2dArray = require('./clean_2d_array');
var interp2d = require('./interp2d');
var findEmpties = require('./find_empties');
var makeBoundArray = require('./make_bound_array');
var BADNUM = require('../../constants/numerical').BADNUM;

module.exports = function calc(gd, trace) {
// prepare the raw data
Expand DownExpand Up@@ -71,6 +72,12 @@ module.exports = function calc(gd, trace) {

z = clean2dArray(zIn, trace, xa, ya);

if(xa.rangebreaks || ya.rangebreaks) {
z = dropZonBreaks(z, trace);
x = trace._x = skipBreaks(trace._x);
y = trace._y = skipBreaks(trace._y);
}

if(isContour || trace.connectgaps) {
trace._emptypoints = findEmpties(z);
interp2d(z, trace._emptypoints);
Expand DownExpand Up@@ -156,3 +163,29 @@ module.exports = function calc(gd, trace) {

return [cd0];
};

function skipBreaks(a) {
var b = [];
var len = a.length;
for(var i = 0; i < len; i++) {
var v = a[i];
if(v !== BADNUM) b.push(v);
}
return b;
}

function dropZonBreaks(z, trace) {
var newZ = [];
var k = -1;
for(var i = 0; i < z.length; i++) {
if(trace._y[i] === BADNUM) continue;
k++;
newZ[k] = [];
for(var j = 0; j < z[i].length; j++) {
if(trace._x[j] === BADNUM) continue;

newZ[k].push(z[i][j]);
}
}
return newZ;
}
11 changes: 7 additions & 4 deletions src/traces/heatmap/convert_column_xyz.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,18 +30,21 @@ module.exports = function convertColumnData(trace, ax1, ax2, var1Name, var2Name,
var text;
var hovertext;

var nI = col2vals.length;
var nJ = col1vals.length;

for(i = 0; i < arrayVarNames.length; i++) {
newArrays[i] = Lib.init2dArray(col2vals.length, col1vals.length);
newArrays[i] = Lib.init2dArray(nI, nJ);
}

if(hasColumnText) {
text = Lib.init2dArray(col2vals.length, col1vals.length);
text = Lib.init2dArray(nI, nJ);
}
if(hasColumnHoverText) {
hovertext = Lib.init2dArray(col2vals.length, col1vals.length);
hovertext = Lib.init2dArray(nI, nJ);
}

var after2before = Lib.init2dArray(col2vals.length, col1vals.length);
var after2before = Lib.init2dArray(nI, nJ);

for(i = 0; i < colLen; i++) {
if(col1[i] !== BADNUM && col2[i] !== BADNUM) {
Expand Down
Binary file addedtest/image/baselines/axes_breaks-contour1d.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-contour2d.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-heatmap1d.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-heatmap2d.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.
Loading
, '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" + '
Fix rangebreaks on heatmap with 2d z array by archmoj · Pull Request #4821 · plotly/plotly.js · GitHub
Skip to content
Fix rangebreaks on heatmap with 2d z array#4821

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

from

May 11, 2020
 Merged


Fix rangebreaks on heatmap with 2d z array
#4821
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
de4ff4f

refactor heatmap convertColumnData


archmoj May 7, 2020
e85b04c

add heatmap rangebreak mocks with 1d & 2d z arrays


archmoj May 7, 2020
9051ab6

remove BADNUMs i.e. rangebreak gaps from heatmap trace.x & y and drop…


archmoj May 7, 2020
5f5f92d

correct baseline of heatmap with 2d-z-array


archmoj May 7, 2020
e2cf395

extend mock data to next day over the break


archmoj May 8, 2020
a7676bd

add tests for coutour with rangebreaks & 1d and 2d z array


archmoj May 11, 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


33 changes: 33 additions & 0 deletions
src/traces/heatmap/calc.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ var clean2dArray = require('./clean_2d_array');
var interp2d = require('./interp2d');
var findEmpties = require('./find_empties');
var makeBoundArray = require('./make_bound_array');
var BADNUM = require('../../constants/numerical').BADNUM;

module.exports = function calc(gd, trace) {
 // prepare the raw data
Expand DownExpand Up@@ -71,6 +72,12 @@ module.exports = function calc(gd, trace) {

 z = clean2dArray(zIn, trace, xa, ya);

 if(xa.rangebreaks || ya.rangebreaks) {
 z = dropZonBreaks(z, trace);
 x = trace._x = skipBreaks(trace._x);
 y = trace._y = skipBreaks(trace._y);
 }

 if(isContour || trace.connectgaps) {
 trace._emptypoints = findEmpties(z);
 interp2d(z, trace._emptypoints);
Expand DownExpand Up@@ -156,3 +163,29 @@ module.exports = function calc(gd, trace) {

 return [cd0];
};

function skipBreaks(a) {
 var b = [];
 var len = a.length;
 for(var i = 0; i < len; i++) {
 var v = a[i];
 if(v !== BADNUM) b.push(v);
 }
 return b;
}

function dropZonBreaks(z, trace) {
 var newZ = [];
 var k = -1;
 for(var i = 0; i < z.length; i++) {
 if(trace._y[i] === BADNUM) continue;
 k++;
 newZ[k] = [];
 for(var j = 0; j < z[i].length; j++) {
 if(trace._x[j] === BADNUM) continue;

 newZ[k].push(z[i][j]);
 }
 }
 return newZ;
}

11 changes: 7 additions & 4 deletions
src/traces/heatmap/convert_column_xyz.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,18 +30,21 @@ module.exports = function convertColumnData(trace, ax1, ax2, var1Name, var2Name,
 var text;
 var hovertext;

 var nI = col2vals.length;
 var nJ = col1vals.length;

 for(i = 0; i < arrayVarNames.length; i++) {
 newArrays[i] = Lib.init2dArray(col2vals.length, col1vals.length);
 newArrays[i] = Lib.init2dArray(nI, nJ);
 }

 if(hasColumnText) {
 text = Lib.init2dArray(col2vals.length, col1vals.length);
 text = Lib.init2dArray(nI, nJ);
 }
 if(hasColumnHoverText) {
 hovertext = Lib.init2dArray(col2vals.length, col1vals.length);
 hovertext = Lib.init2dArray(nI, nJ);
 }

 var after2before = Lib.init2dArray(col2vals.length, col1vals.length);
 var after2before = Lib.init2dArray(nI, nJ);

 for(i = 0; i < colLen; i++) {
 if(col1[i] !== BADNUM && col2[i] !== BADNUM) {
Expand Down
Binary file addedtest/image/baselines/axes_breaks-contour1d.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-contour2d.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-heatmap1d.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-heatmap2d.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.
Loading

, '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('^' + ".*" + '
Fix rangebreaks on heatmap with 2d z array by archmoj · Pull Request #4821 · plotly/plotly.js · GitHub
Skip to content
Fix rangebreaks on heatmap with 2d z array#4821

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

from

May 11, 2020
 Merged


Fix rangebreaks on heatmap with 2d z array
#4821
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
de4ff4f

refactor heatmap convertColumnData


archmoj May 7, 2020
e85b04c

add heatmap rangebreak mocks with 1d & 2d z arrays


archmoj May 7, 2020
9051ab6

remove BADNUMs i.e. rangebreak gaps from heatmap trace.x & y and drop…


archmoj May 7, 2020
5f5f92d

correct baseline of heatmap with 2d-z-array


archmoj May 7, 2020
e2cf395

extend mock data to next day over the break


archmoj May 8, 2020
a7676bd

add tests for coutour with rangebreaks & 1d and 2d z array


archmoj May 11, 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


33 changes: 33 additions & 0 deletions
src/traces/heatmap/calc.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ var clean2dArray = require('./clean_2d_array');
var interp2d = require('./interp2d');
var findEmpties = require('./find_empties');
var makeBoundArray = require('./make_bound_array');
var BADNUM = require('../../constants/numerical').BADNUM;

module.exports = function calc(gd, trace) {
 // prepare the raw data
Expand DownExpand Up@@ -71,6 +72,12 @@ module.exports = function calc(gd, trace) {

 z = clean2dArray(zIn, trace, xa, ya);

 if(xa.rangebreaks || ya.rangebreaks) {
 z = dropZonBreaks(z, trace);
 x = trace._x = skipBreaks(trace._x);
 y = trace._y = skipBreaks(trace._y);
 }

 if(isContour || trace.connectgaps) {
 trace._emptypoints = findEmpties(z);
 interp2d(z, trace._emptypoints);
Expand DownExpand Up@@ -156,3 +163,29 @@ module.exports = function calc(gd, trace) {

 return [cd0];
};

function skipBreaks(a) {
 var b = [];
 var len = a.length;
 for(var i = 0; i < len; i++) {
 var v = a[i];
 if(v !== BADNUM) b.push(v);
 }
 return b;
}

function dropZonBreaks(z, trace) {
 var newZ = [];
 var k = -1;
 for(var i = 0; i < z.length; i++) {
 if(trace._y[i] === BADNUM) continue;
 k++;
 newZ[k] = [];
 for(var j = 0; j < z[i].length; j++) {
 if(trace._x[j] === BADNUM) continue;

 newZ[k].push(z[i][j]);
 }
 }
 return newZ;
}

11 changes: 7 additions & 4 deletions
src/traces/heatmap/convert_column_xyz.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,18 +30,21 @@ module.exports = function convertColumnData(trace, ax1, ax2, var1Name, var2Name,
 var text;
 var hovertext;

 var nI = col2vals.length;
 var nJ = col1vals.length;

 for(i = 0; i < arrayVarNames.length; i++) {
 newArrays[i] = Lib.init2dArray(col2vals.length, col1vals.length);
 newArrays[i] = Lib.init2dArray(nI, nJ);
 }

 if(hasColumnText) {
 text = Lib.init2dArray(col2vals.length, col1vals.length);
 text = Lib.init2dArray(nI, nJ);
 }
 if(hasColumnHoverText) {
 hovertext = Lib.init2dArray(col2vals.length, col1vals.length);
 hovertext = Lib.init2dArray(nI, nJ);
 }

 var after2before = Lib.init2dArray(col2vals.length, col1vals.length);
 var after2before = Lib.init2dArray(nI, nJ);

 for(i = 0; i < colLen; i++) {
 if(col1[i] !== BADNUM && col2[i] !== BADNUM) {
Expand Down
Binary file addedtest/image/baselines/axes_breaks-contour1d.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-contour2d.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-heatmap1d.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-heatmap2d.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.
Loading

, '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('^' + ".*" + '
Fix rangebreaks on heatmap with 2d z array by archmoj · Pull Request #4821 · plotly/plotly.js · GitHub
Skip to content
Fix rangebreaks on heatmap with 2d z array#4821

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

from

May 11, 2020
 Merged


Fix rangebreaks on heatmap with 2d z array
#4821
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
de4ff4f

refactor heatmap convertColumnData


archmoj May 7, 2020
e85b04c

add heatmap rangebreak mocks with 1d & 2d z arrays


archmoj May 7, 2020
9051ab6

remove BADNUMs i.e. rangebreak gaps from heatmap trace.x & y and drop…


archmoj May 7, 2020
5f5f92d

correct baseline of heatmap with 2d-z-array


archmoj May 7, 2020
e2cf395

extend mock data to next day over the break


archmoj May 8, 2020
a7676bd

add tests for coutour with rangebreaks & 1d and 2d z array


archmoj May 11, 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


33 changes: 33 additions & 0 deletions
src/traces/heatmap/calc.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ var clean2dArray = require('./clean_2d_array');
var interp2d = require('./interp2d');
var findEmpties = require('./find_empties');
var makeBoundArray = require('./make_bound_array');
var BADNUM = require('../../constants/numerical').BADNUM;

module.exports = function calc(gd, trace) {
 // prepare the raw data
Expand DownExpand Up@@ -71,6 +72,12 @@ module.exports = function calc(gd, trace) {

 z = clean2dArray(zIn, trace, xa, ya);

 if(xa.rangebreaks || ya.rangebreaks) {
 z = dropZonBreaks(z, trace);
 x = trace._x = skipBreaks(trace._x);
 y = trace._y = skipBreaks(trace._y);
 }

 if(isContour || trace.connectgaps) {
 trace._emptypoints = findEmpties(z);
 interp2d(z, trace._emptypoints);
Expand DownExpand Up@@ -156,3 +163,29 @@ module.exports = function calc(gd, trace) {

 return [cd0];
};

function skipBreaks(a) {
 var b = [];
 var len = a.length;
 for(var i = 0; i < len; i++) {
 var v = a[i];
 if(v !== BADNUM) b.push(v);
 }
 return b;
}

function dropZonBreaks(z, trace) {
 var newZ = [];
 var k = -1;
 for(var i = 0; i < z.length; i++) {
 if(trace._y[i] === BADNUM) continue;
 k++;
 newZ[k] = [];
 for(var j = 0; j < z[i].length; j++) {
 if(trace._x[j] === BADNUM) continue;

 newZ[k].push(z[i][j]);
 }
 }
 return newZ;
}

11 changes: 7 additions & 4 deletions
src/traces/heatmap/convert_column_xyz.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,18 +30,21 @@ module.exports = function convertColumnData(trace, ax1, ax2, var1Name, var2Name,
 var text;
 var hovertext;

 var nI = col2vals.length;
 var nJ = col1vals.length;

 for(i = 0; i < arrayVarNames.length; i++) {
 newArrays[i] = Lib.init2dArray(col2vals.length, col1vals.length);
 newArrays[i] = Lib.init2dArray(nI, nJ);
 }

 if(hasColumnText) {
 text = Lib.init2dArray(col2vals.length, col1vals.length);
 text = Lib.init2dArray(nI, nJ);
 }
 if(hasColumnHoverText) {
 hovertext = Lib.init2dArray(col2vals.length, col1vals.length);
 hovertext = Lib.init2dArray(nI, nJ);
 }

 var after2before = Lib.init2dArray(col2vals.length, col1vals.length);
 var after2before = Lib.init2dArray(nI, nJ);

 for(i = 0; i < colLen; i++) {
 if(col1[i] !== BADNUM && col2[i] !== BADNUM) {
Expand Down
Binary file addedtest/image/baselines/axes_breaks-contour1d.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-contour2d.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-heatmap1d.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-heatmap2d.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.
Loading

, '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" + '
Fix rangebreaks on heatmap with 2d z array by archmoj · Pull Request #4821 · plotly/plotly.js · GitHub
Skip to content
Fix rangebreaks on heatmap with 2d z array#4821

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

from

May 11, 2020
 Merged


Fix rangebreaks on heatmap with 2d z array
#4821
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
de4ff4f

refactor heatmap convertColumnData


archmoj May 7, 2020
e85b04c

add heatmap rangebreak mocks with 1d & 2d z arrays


archmoj May 7, 2020
9051ab6

remove BADNUMs i.e. rangebreak gaps from heatmap trace.x & y and drop…


archmoj May 7, 2020
5f5f92d

correct baseline of heatmap with 2d-z-array


archmoj May 7, 2020
e2cf395

extend mock data to next day over the break


archmoj May 8, 2020
a7676bd

add tests for coutour with rangebreaks & 1d and 2d z array


archmoj May 11, 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


33 changes: 33 additions & 0 deletions
src/traces/heatmap/calc.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ var clean2dArray = require('./clean_2d_array');
var interp2d = require('./interp2d');
var findEmpties = require('./find_empties');
var makeBoundArray = require('./make_bound_array');
var BADNUM = require('../../constants/numerical').BADNUM;

module.exports = function calc(gd, trace) {
 // prepare the raw data
Expand DownExpand Up@@ -71,6 +72,12 @@ module.exports = function calc(gd, trace) {

 z = clean2dArray(zIn, trace, xa, ya);

 if(xa.rangebreaks || ya.rangebreaks) {
 z = dropZonBreaks(z, trace);
 x = trace._x = skipBreaks(trace._x);
 y = trace._y = skipBreaks(trace._y);
 }

 if(isContour || trace.connectgaps) {
 trace._emptypoints = findEmpties(z);
 interp2d(z, trace._emptypoints);
Expand DownExpand Up@@ -156,3 +163,29 @@ module.exports = function calc(gd, trace) {

 return [cd0];
};

function skipBreaks(a) {
 var b = [];
 var len = a.length;
 for(var i = 0; i < len; i++) {
 var v = a[i];
 if(v !== BADNUM) b.push(v);
 }
 return b;
}

function dropZonBreaks(z, trace) {
 var newZ = [];
 var k = -1;
 for(var i = 0; i < z.length; i++) {
 if(trace._y[i] === BADNUM) continue;
 k++;
 newZ[k] = [];
 for(var j = 0; j < z[i].length; j++) {
 if(trace._x[j] === BADNUM) continue;

 newZ[k].push(z[i][j]);
 }
 }
 return newZ;
}

11 changes: 7 additions & 4 deletions
src/traces/heatmap/convert_column_xyz.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,18 +30,21 @@ module.exports = function convertColumnData(trace, ax1, ax2, var1Name, var2Name,
 var text;
 var hovertext;

 var nI = col2vals.length;
 var nJ = col1vals.length;

 for(i = 0; i < arrayVarNames.length; i++) {
 newArrays[i] = Lib.init2dArray(col2vals.length, col1vals.length);
 newArrays[i] = Lib.init2dArray(nI, nJ);
 }

 if(hasColumnText) {
 text = Lib.init2dArray(col2vals.length, col1vals.length);
 text = Lib.init2dArray(nI, nJ);
 }
 if(hasColumnHoverText) {
 hovertext = Lib.init2dArray(col2vals.length, col1vals.length);
 hovertext = Lib.init2dArray(nI, nJ);
 }

 var after2before = Lib.init2dArray(col2vals.length, col1vals.length);
 var after2before = Lib.init2dArray(nI, nJ);

 for(i = 0; i < colLen; i++) {
 if(col1[i] !== BADNUM && col2[i] !== BADNUM) {
Expand Down
Binary file addedtest/image/baselines/axes_breaks-contour1d.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-contour2d.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-heatmap1d.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-heatmap2d.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.
Loading

, '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('^' + ".*" + '
Fix rangebreaks on heatmap with 2d z array by archmoj · Pull Request #4821 · plotly/plotly.js · GitHub
Skip to content
Fix rangebreaks on heatmap with 2d z array#4821

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

from

May 11, 2020
 Merged


Fix rangebreaks on heatmap with 2d z array
#4821
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
de4ff4f

refactor heatmap convertColumnData


archmoj May 7, 2020
e85b04c

add heatmap rangebreak mocks with 1d & 2d z arrays


archmoj May 7, 2020
9051ab6

remove BADNUMs i.e. rangebreak gaps from heatmap trace.x & y and drop…


archmoj May 7, 2020
5f5f92d

correct baseline of heatmap with 2d-z-array


archmoj May 7, 2020
e2cf395

extend mock data to next day over the break


archmoj May 8, 2020
a7676bd

add tests for coutour with rangebreaks & 1d and 2d z array


archmoj May 11, 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


33 changes: 33 additions & 0 deletions
src/traces/heatmap/calc.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ var clean2dArray = require('./clean_2d_array');
var interp2d = require('./interp2d');
var findEmpties = require('./find_empties');
var makeBoundArray = require('./make_bound_array');
var BADNUM = require('../../constants/numerical').BADNUM;

module.exports = function calc(gd, trace) {
 // prepare the raw data
Expand DownExpand Up@@ -71,6 +72,12 @@ module.exports = function calc(gd, trace) {

 z = clean2dArray(zIn, trace, xa, ya);

 if(xa.rangebreaks || ya.rangebreaks) {
 z = dropZonBreaks(z, trace);
 x = trace._x = skipBreaks(trace._x);
 y = trace._y = skipBreaks(trace._y);
 }

 if(isContour || trace.connectgaps) {
 trace._emptypoints = findEmpties(z);
 interp2d(z, trace._emptypoints);
Expand DownExpand Up@@ -156,3 +163,29 @@ module.exports = function calc(gd, trace) {

 return [cd0];
};

function skipBreaks(a) {
 var b = [];
 var len = a.length;
 for(var i = 0; i < len; i++) {
 var v = a[i];
 if(v !== BADNUM) b.push(v);
 }
 return b;
}

function dropZonBreaks(z, trace) {
 var newZ = [];
 var k = -1;
 for(var i = 0; i < z.length; i++) {
 if(trace._y[i] === BADNUM) continue;
 k++;
 newZ[k] = [];
 for(var j = 0; j < z[i].length; j++) {
 if(trace._x[j] === BADNUM) continue;

 newZ[k].push(z[i][j]);
 }
 }
 return newZ;
}

11 changes: 7 additions & 4 deletions
src/traces/heatmap/convert_column_xyz.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,18 +30,21 @@ module.exports = function convertColumnData(trace, ax1, ax2, var1Name, var2Name,
 var text;
 var hovertext;

 var nI = col2vals.length;
 var nJ = col1vals.length;

 for(i = 0; i < arrayVarNames.length; i++) {
 newArrays[i] = Lib.init2dArray(col2vals.length, col1vals.length);
 newArrays[i] = Lib.init2dArray(nI, nJ);
 }

 if(hasColumnText) {
 text = Lib.init2dArray(col2vals.length, col1vals.length);
 text = Lib.init2dArray(nI, nJ);
 }
 if(hasColumnHoverText) {
 hovertext = Lib.init2dArray(col2vals.length, col1vals.length);
 hovertext = Lib.init2dArray(nI, nJ);
 }

 var after2before = Lib.init2dArray(col2vals.length, col1vals.length);
 var after2before = Lib.init2dArray(nI, nJ);

 for(i = 0; i < colLen; i++) {
 if(col1[i] !== BADNUM && col2[i] !== BADNUM) {
Expand Down
Binary file addedtest/image/baselines/axes_breaks-contour1d.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-contour2d.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-heatmap1d.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-heatmap2d.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.
Loading

, '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); }
})();
})();
Fix rangebreaks on heatmap with 2d z array by archmoj · Pull Request #4821 · plotly/plotly.js · GitHub
Skip to content
Fix rangebreaks on heatmap with 2d z array#4821

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

from

May 11, 2020
 Merged


Fix rangebreaks on heatmap with 2d z array
#4821
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
de4ff4f

refactor heatmap convertColumnData


archmoj May 7, 2020
e85b04c

add heatmap rangebreak mocks with 1d & 2d z arrays


archmoj May 7, 2020
9051ab6

remove BADNUMs i.e. rangebreak gaps from heatmap trace.x & y and drop…


archmoj May 7, 2020
5f5f92d

correct baseline of heatmap with 2d-z-array


archmoj May 7, 2020
e2cf395

extend mock data to next day over the break


archmoj May 8, 2020
a7676bd

add tests for coutour with rangebreaks & 1d and 2d z array


archmoj May 11, 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


33 changes: 33 additions & 0 deletions
src/traces/heatmap/calc.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ var clean2dArray = require('./clean_2d_array');
var interp2d = require('./interp2d');
var findEmpties = require('./find_empties');
var makeBoundArray = require('./make_bound_array');
var BADNUM = require('../../constants/numerical').BADNUM;

module.exports = function calc(gd, trace) {
 // prepare the raw data
Expand DownExpand Up@@ -71,6 +72,12 @@ module.exports = function calc(gd, trace) {

 z = clean2dArray(zIn, trace, xa, ya);

 if(xa.rangebreaks || ya.rangebreaks) {
 z = dropZonBreaks(z, trace);
 x = trace._x = skipBreaks(trace._x);
 y = trace._y = skipBreaks(trace._y);
 }

 if(isContour || trace.connectgaps) {
 trace._emptypoints = findEmpties(z);
 interp2d(z, trace._emptypoints);
Expand DownExpand Up@@ -156,3 +163,29 @@ module.exports = function calc(gd, trace) {

 return [cd0];
};

function skipBreaks(a) {
 var b = [];
 var len = a.length;
 for(var i = 0; i < len; i++) {
 var v = a[i];
 if(v !== BADNUM) b.push(v);
 }
 return b;
}

function dropZonBreaks(z, trace) {
 var newZ = [];
 var k = -1;
 for(var i = 0; i < z.length; i++) {
 if(trace._y[i] === BADNUM) continue;
 k++;
 newZ[k] = [];
 for(var j = 0; j < z[i].length; j++) {
 if(trace._x[j] === BADNUM) continue;

 newZ[k].push(z[i][j]);
 }
 }
 return newZ;
}

11 changes: 7 additions & 4 deletions
src/traces/heatmap/convert_column_xyz.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,18 +30,21 @@ module.exports = function convertColumnData(trace, ax1, ax2, var1Name, var2Name,
 var text;
 var hovertext;

 var nI = col2vals.length;
 var nJ = col1vals.length;

 for(i = 0; i < arrayVarNames.length; i++) {
 newArrays[i] = Lib.init2dArray(col2vals.length, col1vals.length);
 newArrays[i] = Lib.init2dArray(nI, nJ);
 }

 if(hasColumnText) {
 text = Lib.init2dArray(col2vals.length, col1vals.length);
 text = Lib.init2dArray(nI, nJ);
 }
 if(hasColumnHoverText) {
 hovertext = Lib.init2dArray(col2vals.length, col1vals.length);
 hovertext = Lib.init2dArray(nI, nJ);
 }

 var after2before = Lib.init2dArray(col2vals.length, col1vals.length);
 var after2before = Lib.init2dArray(nI, nJ);

 for(i = 0; i < colLen; i++) {
 if(col1[i] !== BADNUM && col2[i] !== BADNUM) {
Expand Down
Binary file addedtest/image/baselines/axes_breaks-contour1d.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-contour2d.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-heatmap1d.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-heatmap2d.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.
Loading