piePattern : rework the index of legend items

- take the index from the point in the styleOne function, instead of setting it before in the data structure
- zz-pie_pattern : height 500

Author: thierryVergult

src/components/drawing/index.js

@@ -619,20 +619,22 @@ drawing.getPatternAttr = function(mp, i, dflt) {
     return mp;
 };
 
-drawing.pointStyle = function(s, trace, gd) {
+drawing.pointStyle = function(s, trace, gd, pt) {
     if(!s.size()) return;
 
     var fns = drawing.makePointStyleFns(trace);
 
     s.each(function(d) {
-        drawing.singlePointStyle(d, d3.select(this), trace, fns, gd);
+        drawing.singlePointStyle(d, d3.select(this), trace, fns, gd, pt);
     });
 };
 
-drawing.singlePointStyle = function(d, sel, trace, fns, gd) {
+drawing.singlePointStyle = function(d, sel, trace, fns, gd, pt) {
     var marker = trace.marker;
     var markerLine = marker.line;
 
+    if( pt && pt.i>=0 && d.i === undefined) d.i = pt.i;
+
     sel.style('opacity',
         fns.selectedOpacityFn ? fns.selectedOpacityFn(d) :
             (d.mo === undefined ? marker.opacity : d.mo)

src/traces/pie/style_one.js

@@ -9,31 +9,18 @@ module.exports = function styleOne(s, pt, trace, gd) {
     var lineColor = castOption(line.color, pt.pts) || Color.defaultLine;
     var lineWidth = castOption(line.width, pt.pts) || 0;
 
-    // some temporary console statements, for later debugging, needs to be removed once the assembler below gets clean
-    // console.log('styleOne - s0', s[0], s[0][0], '__data__', s[0][0].__data__);
-    // console.log( 's0 iiiiiiiii pie    : ', (s[0][0].__data__.i !== undefined ? s[0][0].__data__.i : 'nope'));
-    // console.log( 's0 iiiiiiiii legend : ', (s[0][0].__data__[0] !== undefined ? s[0][0].__data__[0].i : 'nope'));
-    // console.log( 'pie style_one: s', s, 'trace', trace, 'gd', gd);
-
-    // to do: rework this assembler code in a next iteration.
-    var gibberish = s[0][0].__data__;
-    if(gibberish.i === undefined) {
-        // coming from a legend
-        gibberish.i = gibberish[0].i;
-    }
-    // console.log( 's0 - i : ', s[0][0].__data__['i'], 'pt.color', pt.color, 'trace', trace);
-
     // enforce the point color, when colors (with s) & the pattern shape are missing.
     // 'abuse' the color attribute, used in the Drawing component for bar trace type.
-    // alternative could be to pass the point color as an extra parameter in pointStyle
+    // alternative: could be to pass the point color as an extra parameter in pointStyle
+    // alternative: could be to activate pattern also for funnelarea
     var marker = trace.marker;
     if(marker.pattern) {
         if(!marker.colors || !marker.pattern.shape) marker.color = pt.color;
     } else {
         marker.color = pt.color;
     }
 
-    Drawing.pointStyle(s, trace, gd);
+    Drawing.pointStyle(s, trace, gd, pt);
     // to do : push into s.style d3 logic
 
     s.style('stroke-width', lineWidth)