Skip to content

indicator: several improvements/fixes #4029

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 18 commits into from
Jul 19, 2019
+754 −188
Merged

indicator: several improvements/fixes #4029

Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
2c378e0
indicator: changes default delta.valueformat and delta alignment
antoinerg Jul 3, 2019
4d2ad95
use default valueformat if emptry string is provided
antoinerg Jul 4, 2019
cb5d3c4
set correct color for delta during animation, stash its last value
antoinerg Jul 4, 2019
3b9028a
fix bullet with range spanning negative values
antoinerg Jul 5, 2019
a8ccf2b
fix for delta.reference equal to zero
antoinerg Jul 5, 2019
1e7f21d
manually compute numbersbBox to rescale when the animation starts
antoinerg Jul 5, 2019
6e9def2
lastValue: defaults to current value to fix first animation
antoinerg Jul 8, 2019
68c2aef
add mock to test bullet spanning negative values
antoinerg Jul 8, 2019
8cea8e7
animation: do not display SI prefix if not present in start and end
antoinerg Jul 11, 2019
b942832
indicator: remove + sign by default
antoinerg Jul 11, 2019
5590398
simplify passing opts in indicator plot.js
archmoj Jul 11, 2019
438c89c
use axisLayer for clarity
archmoj Jul 11, 2019
fc5c2c9
Merge pull request #4037 from plotly/indicator-fixes_moj_simplify-opts
archmoj Jul 11, 2019
0e036a0
add new mocks to test all attrributes and number formatting
archmoj Jul 19, 2019
bd0aa79
use '' valueformat as dflt
etpinard Jul 19, 2019
3acb333
show NaN values as - + use convertToTspans to render exponents ok
etpinard Jul 19, 2019
0160e16
draw blank value arc/bullet when value is NaN
etpinard Jul 19, 2019
38be82d
Merge branch 'master' into indicator-fixes
etpinard Jul 19, 2019
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
2 changes: 1 addition & 1 deletion src/traces/indicator/attributes.js
View file
Original file line number Diff line number Diff line change
@@ -163,7 +163,7 @@ module.exports = {
number: {
valueformat: {
valType: 'string',
dflt: '.3s',
dflt: '',
role: 'info',
editType: 'plot',
description: [
11 changes: 8 additions & 3 deletions src/traces/indicator/calc.js
View file
Original file line number Diff line number Diff line change
@@ -14,13 +14,18 @@ function calc(gd, trace) {
var cd = [];

var lastReading = trace.value;
var secondLastReading = trace.delta ? trace.delta.reference : trace._lastValue || trace.value;
if(!(typeof trace._lastValue === 'number')) trace._lastValue = trace.value;
var secondLastReading = trace._lastValue;
var deltaRef = secondLastReading;
if(trace._hasDelta && typeof trace.delta.reference === 'number') {
deltaRef = trace.delta.reference;
}
cd[0] = {
y: lastReading,
lastY: secondLastReading,

delta: lastReading - secondLastReading,
relativeDelta: (lastReading - secondLastReading) / secondLastReading,
delta: lastReading - deltaRef,
relativeDelta: (lastReading - deltaRef) / deltaRef,
};
return cd;
}
8 changes: 5 additions & 3 deletions src/traces/indicator/defaults.js
View file
Original file line number Diff line number Diff line change
@@ -32,7 +32,8 @@ function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
traceOut._hasDelta = traceOut.mode.indexOf('delta') !== -1;
traceOut._hasGauge = traceOut.mode.indexOf('gauge') !== -1;

coerce('value');
var value = coerce('value');
traceOut._range = [0, (typeof value === 'number' ? 1.5 * value : 1)];

// Number attributes
var auto = new Array(2);
@@ -63,7 +64,7 @@ function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
}
coerce('delta.reference', traceOut.value);
coerce('delta.relative');
coerce('delta.valueformat', traceOut.delta.relative ? '2%' : '.3s');
coerce('delta.valueformat', traceOut.delta.relative ? '2%' : '');
coerce('delta.increasing.symbol');
coerce('delta.increasing.color');
coerce('delta.decreasing.symbol');
@@ -87,6 +88,7 @@ function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
function coerceGaugeAxis(attr, dflt) {
return Lib.coerce(axisIn, axisOut, attributes.gauge.axis, attr, dflt);
}

if(traceOut._hasGauge) {
gaugeIn = traceIn.gauge;
if(!gaugeIn) gaugeIn = {};
@@ -130,7 +132,7 @@ function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
if(gaugeIn) axisIn = gaugeIn.axis || {};
axisOut = Template.newContainer(gaugeOut, 'axis');
coerceGaugeAxis('visible');
coerceGaugeAxis('range', [0, 1.5 * traceOut.value]);
traceOut._range = coerceGaugeAxis('range', traceOut._range);

var opts = {outerTicks: true};
handleTickValueDefaults(axisIn, axisOut, coerceGaugeAxis, 'linear');
Loading