From c3dc2e662a397d6f92f6521842c8ddbe2c37c457 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Etienne=20T=C3=A9treault-Pinard?= Date: Fri, 17 Nov 2017 17:11:49 -0500 Subject: [PATCH] fix #2168 - fill in 'id' in bar calcdata ... so that ErrorBars.plot know what do it with it --- src/traces/bar/calc.js | 8 ++++++-- test/image/baselines/error_bar_bar_ids.png | Bin 0 -> 13685 bytes test/image/mocks/error_bar_bar_ids.json | 20 ++++++++++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 test/image/baselines/error_bar_bar_ids.png create mode 100644 test/image/mocks/error_bar_bar_ids.json diff --git a/src/traces/bar/calc.js b/src/traces/bar/calc.js index 40389a6d514..74a6804ff57 100644 --- a/src/traces/bar/calc.js +++ b/src/traces/bar/calc.js @@ -48,12 +48,16 @@ module.exports = function calc(gd, trace) { } // create the "calculated data" to plot - var serieslen = Math.min(pos.length, size.length), - cd = new Array(serieslen); + var serieslen = Math.min(pos.length, size.length); + var cd = new Array(serieslen); // set position and size for(i = 0; i < serieslen; i++) { cd[i] = { p: pos[i], s: size[i] }; + + if(trace.ids) { + cd[i].id = String(trace.ids[i]); + } } // set base diff --git a/test/image/baselines/error_bar_bar_ids.png b/test/image/baselines/error_bar_bar_ids.png new file mode 100644 index 0000000000000000000000000000000000000000..1ca6a60d49111c021d61f4f454b3da30beb48c3a GIT binary patch literal 13685 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 b&Xe6eO0e>&UjzS6C1Pe`vF)+3)4Bfuz)O*w literal 0 HcmV?d00001 diff --git a/test/image/mocks/error_bar_bar_ids.json b/test/image/mocks/error_bar_bar_ids.json new file mode 100644 index 00000000000..268d77e5c05 --- /dev/null +++ b/test/image/mocks/error_bar_bar_ids.json @@ -0,0 +1,20 @@ +{ + "data": [{ + "type":"bar", + "x": ["A", "B", "C"], + "y": [0, "2.12", "2.32"], + "ids": ["A", "B", "C"], + "name": "Sample", + "marker": { + "color": "#FFFFCC", + "line":{ + "color": "rgba(0,0,0,0.4)", + "width": 1.5 + } + }, + "error_y": { + "array": ["1.32", "1.43", "1.58"], + "arrayminus": ["1.31", "1.44", "1.57"] + } + }] +}