Skip to content

HoverLabels: Check for <= 0 error values for log axes #533

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
merged 1 commit into from
May 13, 2016
Merged

HoverLabels: Check for <= 0 error values for log axes #533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 20 additions & 20 deletions src/plots/cartesian/graph_interact.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ fx.getClosest = function(cd, distfn, pointData) {
};

function cleanPoint(d, hovermode) {
d.posref = hovermode==='y' ? (d.x0+d.x1)/2 : (d.y0+d.y1)/2;
d.posref = hovermode === 'y' ? (d.x0 + d.x1) / 2 : (d.y0 + d.y1) / 2;

// then constrain all the positions to be on the plot
d.x0 = Lib.constrain(d.x0, 0, d.xa._length);
Expand All @@ -639,36 +639,36 @@ function cleanPoint(d, hovermode) {
// and convert the x and y label values into objects
// formatted as text, with font info
var logOffScale;
if(d.xLabelVal!==undefined) {
logOffScale = (d.xa.type==='log' && d.xLabelVal<=0);
if(d.xLabelVal !== undefined) {
logOffScale = (d.xa.type === 'log' && d.xLabelVal <= 0);
var xLabelObj = Axes.tickText(d.xa,
d.xa.c2l(logOffScale ? -d.xLabelVal : d.xLabelVal), 'hover');
if(logOffScale) {
if(d.xLabelVal===0) d.xLabel = '0';
if(d.xLabelVal === 0) d.xLabel = '0';
else d.xLabel = '-' + xLabelObj.text;
}
else d.xLabel = xLabelObj.text;
d.xVal = d.xa.c2d(d.xLabelVal);
}

if(d.yLabelVal!==undefined) {
logOffScale = (d.ya.type==='log' && d.yLabelVal<=0);
if(d.yLabelVal !== undefined) {
logOffScale = (d.ya.type === 'log' && d.yLabelVal <= 0);
var yLabelObj = Axes.tickText(d.ya,
d.ya.c2l(logOffScale ? -d.yLabelVal : d.yLabelVal), 'hover');
if(logOffScale) {
if(d.yLabelVal===0) d.yLabel = '0';
if(d.yLabelVal === 0) d.yLabel = '0';
else d.yLabel = '-' + yLabelObj.text;
}
else d.yLabel = yLabelObj.text;
d.yVal = d.ya.c2d(d.yLabelVal);
}

if(d.zLabelVal!==undefined) d.zLabel = String(d.zLabelVal);
if(d.zLabelVal !== undefined) d.zLabel = String(d.zLabelVal);

// for box means and error bars, add the range to the label
if(d.xerr!==undefined) {
if(!isNaN(d.xerr) && !(d.xa.type === 'log' && d.xerr <= 0)) {
var xeText = Axes.tickText(d.xa, d.xa.c2l(d.xerr), 'hover').text;
if(d.xerrneg!==undefined) {
if(d.xerrneg !== undefined) {
d.xLabel += ' +' + xeText + ' / -' +
Axes.tickText(d.xa, d.xa.c2l(d.xerrneg), 'hover').text;
}
Expand All @@ -677,27 +677,27 @@ function cleanPoint(d, hovermode) {
// small distance penalty for error bars, so that if there are
// traces with errors and some without, the error bar label will
// hoist up to the point
if(hovermode==='x') d.distance += 1;
if(hovermode === 'x') d.distance += 1;
}
if(d.yerr!==undefined) {
if(!isNaN(d.yerr) && !(d.ya.type === 'log' && d.yerr <= 0)) {
var yeText = Axes.tickText(d.ya, d.ya.c2l(d.yerr), 'hover').text;
if(d.yerrneg!==undefined) {
if(d.yerrneg !== undefined) {
d.yLabel += ' +' + yeText + ' / -' +
Axes.tickText(d.ya, d.ya.c2l(d.yerrneg), 'hover').text;
}
else d.yLabel += ' &plusmn; ' + yeText;

if(hovermode==='y') d.distance += 1;
if(hovermode === 'y') d.distance += 1;
}

var infomode = d.trace.hoverinfo;
if(infomode!=='all') {
if(infomode !== 'all') {
infomode = infomode.split('+');
if(infomode.indexOf('x')===-1) d.xLabel = undefined;
if(infomode.indexOf('y')===-1) d.yLabel = undefined;
if(infomode.indexOf('z')===-1) d.zLabel = undefined;
if(infomode.indexOf('text')===-1) d.text = undefined;
if(infomode.indexOf('name')===-1) d.name = undefined;
if(infomode.indexOf('x') === -1) d.xLabel = undefined;
if(infomode.indexOf('y') === -1) d.yLabel = undefined;
if(infomode.indexOf('z') === -1) d.zLabel = undefined;
if(infomode.indexOf('text') === -1) d.text = undefined;
if(infomode.indexOf('name') === -1) d.name = undefined;
}
return d;
}
Expand Down
54 changes: 54 additions & 0 deletions test/jasmine/tests/hover_label_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,60 @@ describe('hover info', function() {
});
});

describe('hover error x text (log axis positive)', function() {
var mockCopy = Lib.extendDeep({}, mock);

mockCopy.data[0].error_x = { array: [] };
mockCopy.data[0].error_x.array[17] = 1;

beforeEach(function(done) {
Plotly.plot(createGraphDiv(), mockCopy.data, mockCopy.layout).then(done);
});

it('responds to hover x+text', function() {
Fx.hover('graph', evt, 'xy');

expect(d3.selectAll('g.axistext').size()).toEqual(1);
expect(d3.selectAll('g.axistext').select('text').html()).toEqual('0.388 ± 1');
});
});

describe('hover error text (log axis 0)', function() {
var mockCopy = Lib.extendDeep({}, mock);

mockCopy.data[0].error_x = { array: [] };
mockCopy.data[0].error_x.array[17] = 0;

beforeEach(function(done) {
Plotly.plot(createGraphDiv(), mockCopy.data, mockCopy.layout).then(done);
});

it('responds to hover x+text', function() {
Fx.hover('graph', evt, 'xy');

expect(d3.selectAll('g.axistext').size()).toEqual(1);
expect(d3.selectAll('g.axistext').select('text').html()).toEqual('0.388');
});
});

describe('hover error text (log axis negative)', function() {
var mockCopy = Lib.extendDeep({}, mock);

mockCopy.data[0].error_x = { array: [] };
mockCopy.data[0].error_x.array[17] = -1;

beforeEach(function(done) {
Plotly.plot(createGraphDiv(), mockCopy.data, mockCopy.layout).then(done);
});

it('responds to hover x+text', function() {
Fx.hover('graph', evt, 'xy');

expect(d3.selectAll('g.axistext').size()).toEqual(1);
expect(d3.selectAll('g.axistext').select('text').html()).toEqual('0.388');
});
});

describe('hover info text with html', function() {
var mockCopy = Lib.extendDeep({}, mock);

Expand Down