indicator: add mode attribute

antoinerg · antoinerg · commit 66eeb439ebf8 · 2019-05-23T14:25:38.000-04:00
diff --git a/src/plot_api/plot_api.js b/src/plot_api/plot_api.js
@@ -3779,6 +3779,9 @@ function makePlotFramework(gd) {
     // single sunburst layer for the whole plot
     fullLayout._sunburstlayer = fullLayout._paper.append('g').classed('sunburstlayer', true);
 
+    // single indicator layer for the whole plot
+    fullLayout._indicatorlayer = fullLayout._paper.append('g').classed('indicatorlayer', true);
+
     // fill in image server scrape-svg
     fullLayout._glimages = fullLayout._paper.append('g').classed('glimages', true);
 
diff --git a/src/traces/indicator/attributes.js b/src/traces/indicator/attributes.js
@@ -8,12 +8,24 @@
 
 'use strict';
 
-var plotAttrs = require('../../plots/attributes');
-var domainAttrs = require('../../plots/domain').attributes;
-var hovertemplateAttrs = require('../../components/fx/hovertemplate_attributes');
+// var plotAttrs = require('../../plots/attributes');
+// var domainAttrs = require('../../plots/domain').attributes;
 
-var extendFlat = require('../../lib/extend').extendFlat;
+// var extendFlat = require('../../lib/extend').extendFlat;
 
 module.exports = {
-    
+    values: {
+        valType: 'data_array',
+        editType: 'calc',
+        description: [
+            'Sets the number to be displayed.'
+        ].join(' ')
+    },
+
+    mode: {
+        valType: 'enumerated',
+        editType: 'calc',
+        values: ['gauge', 'bignumber'],
+        dflt: 'bignumber'
+    }
 };
diff --git a/src/traces/indicator/calc.js b/src/traces/indicator/calc.js
@@ -9,14 +9,9 @@
 'use strict';
 
 function calc(gd, trace) {
-    return true;
-}
-
-function crossTraceCalc(gd) {
-    return true;
+    return trace.values[0];
 }
 
 module.exports = {
-    calc: calc,
-    crossTraceCalc: crossTraceCalc
+    calc: calc
 };
diff --git a/src/traces/indicator/defaults.js b/src/traces/indicator/defaults.js
@@ -17,4 +17,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     function coerce(attr, dflt) {
         return Lib.coerce(traceIn, traceOut, attributes, attr, dflt);
     }
+
+    coerce('mode');
+    coerce('values');
 };
diff --git a/src/traces/indicator/index.js b/src/traces/indicator/index.js
@@ -20,7 +20,6 @@ module.exports = {
     supplyLayoutDefaults: require('./layout_defaults'),
 
     calc: require('./calc').calc,
-    crossTraceCalc: require('./calc').crossTraceCalc,
 
     plot: require('./plot'),
     style: require('./style'),
diff --git a/test/image/mocks/indicator_bignumber.json b/test/image/mocks/indicator_bignumber.json
@@ -0,0 +1,7 @@
+{
+  "data": [{
+    "type": "indicator",
+    "mode": "bignumber",
+    "values": [543]
+  }]
+}
diff --git a/test/jasmine/tests/indicator_test.js b/test/jasmine/tests/indicator_test.js
@@ -31,11 +31,8 @@ describe('Indicator defaults', function() {
         return gd._fullData[0];
     }
 
-    it('finds the minimum length of labels & values', function() {
+    it('to bignumber mode', function() {
         var out = _supply({type: 'indicator', values: [1, 2, 3]});
-        expect(out._length).toBe(2);
-
-        out = _supply({type: 'indicator', values: [1, 2]});
-        expect(out._length).toBe(2);
+        expect(out.mode).toBe('bignumber');
     });
 });

Original file line number	Diff line number	Diff line change
`@@ -17,4 +17,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout`
`17`	`17`	`function coerce(attr, dflt) {`
`18`	`18`	`return Lib.coerce(traceIn, traceOut, attributes, attr, dflt);`
`19`	`19`	`}`
	`20`	`+`
	`21`	`+ coerce('mode');`
	`22`	`+ coerce('values');`
`20`	`23`	`};`