sankey separators

lib/locales/it.js

@@ -52,7 +52,7 @@ module.exports = {
         'q1:': 'q1:',                                                                                        // traces/box/calc.js:130
         'q3:': 'q3:',                                                                                        // traces/box/calc.js:131
         'source:': 'sorgente:',                                                                               // traces/sankey/plot.js:140
-        'target:': 'target:',                                                                                 // traces/sankey/plot.js:141
+        'target:': 'destinazione:',                                                                                 // traces/sankey/plot.js:141
         'max:': 'max.:',                                                                                    // traces/box/calc.js:132
         'mean ± σ:': 'media ± σ:',                                                                     // traces/box/calc.js:133
         'mean:': 'media:',                                                                             // traces/box/calc.js:133
@@ -67,8 +67,8 @@ module.exports = {
         'high:': 'alto:',                                                                             // traces/ohlc/transform.js:137
         'kde:': 'kde:',                                                                              // traces/violin/calc.js:73
         'low:': 'basso:',                                                                              // traces/ohlc/transform.js:138
-        'incoming flow count:': 'Flusso in entrata:',                                                // traces/sankey/plot.js:142
-        'outgoing flow count:': 'Flusso in uscita:',                                                // traces/sankey/plot.js:143
+        'incoming flow count:': 'Flussi in entrata:',                                                // traces/sankey/plot.js:142
+        'outgoing flow count:': 'Flussi in uscita:',                                                // traces/sankey/plot.js:143
         'Toggle show closest data on hover': 'Abilita mostra i dati più vicini al passaggio del mouse',                   // components/modebar/buttons.js:353
     },
     format: {
@@ -85,6 +85,8 @@ module.exports = {
             'Gen', 'Feb', 'Mar', 'Apr', 'Mag', 'Giu',
             'Lug', 'Ago', 'Set', 'Ott', 'Nov', 'Dic'
         ],
+        decimal: ',',
+        thousands: '.',
         date: '%d/%m/%Y'
     }
 };

src/lib/index.js

@@ -934,7 +934,7 @@ lib.numSeparate = function(value, separators, separatethousands) {
         x2 = x.length > 1 ? decimalSep + x[1] : '';
 
     // Years are ignored for thousands separators
-    if(thouSep && (x.length > 1 || x1.length > 4 || separatethousands)) {
+    if(thouSep && x.length > 1 && separatethousands) {
         while(thousandsRe.test(x1)) {
             x1 = x1.replace(thousandsRe, '$1' + thouSep + '$2');
         }

src/traces/sankey/attributes.js

@@ -54,6 +54,16 @@ module.exports = overrideAll({
         ].join(' ')
     },
 
+    separatethousands: {
+        valType: 'boolean',
+        dflt: false,
+        role: 'style',
+        editType: 'calc',
+        description: [
+            'If "true", even 4-digit integers are separated'
+        ].join(' ')
+    },
+
     arrangement: {
         valType: 'enumerated',
         values: ['snap', 'perpendicular', 'freeform', 'fixed'],

src/traces/sankey/defaults.js

@@ -51,6 +51,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     coerce('orientation');
     coerce('valueformat');
     coerce('valuesuffix');
+    coerce('separatethousands');
     coerce('arrangement');
 
     Lib.coerceFont(coerce, 'textfont', Lib.extendFlat({}, layout.font));

src/traces/sankey/plot.js

@@ -152,7 +152,7 @@ module.exports = function plot(gd, calcData) {
         var tooltip = Fx.loneHover({
             x: hoverCenterX - rootBBox.left,
             y: hoverCenterY - rootBBox.top,
-            name: d3.format(d.valueFormat)(d.link.value) + d.valueSuffix,
+            name: Lib.numSeparate(d3.format(d.valueFormat)(d.link.value),gd._fullLayout.separators,d.separatethousands) + d.valueSuffix,
             text: [
                 d.link.label || '',
                 sourceLabel + d.link.source.label,
@@ -213,7 +213,7 @@ module.exports = function plot(gd, calcData) {
             x0: hoverCenterX0,
             x1: hoverCenterX1,
             y: hoverCenterY,
-            name: d3.format(d.valueFormat)(d.node.value) + d.valueSuffix,
+            name: Lib.numSeparate(d3.format(d.valueFormat)(d.node.value),gd._fullLayout.separators,d.separatethousands) + d.valueSuffix,
             text: [
                 d.node.label,
                 incomingLabel + d.node.targetLinks.length,

src/traces/sankey/render.js

@@ -81,6 +81,7 @@ function sankeyModel(layout, d, traceIndex) {
     var linkLineWidth = trace.link.line.width;
     var valueFormat = trace.valueformat;
     var valueSuffix = trace.valuesuffix;
+    var separatethousands = trace.separatethousands;
     var textFont = trace.textfont;
 
     var width = layout.width * (domain.x[1] - domain.x[0]);
@@ -171,6 +172,7 @@ function sankeyModel(layout, d, traceIndex) {
         linkLineWidth: linkLineWidth,
         valueFormat: valueFormat,
         valueSuffix: valueSuffix,
+        separatethousands: separatethousands,
         textFont: textFont,
         translateX: domain.x[0] * width + layout.margin.l,
         translateY: layout.height - domain.y[1] * layout.height + layout.margin.t,
@@ -209,6 +211,7 @@ function linkModel(uniqueKeys, d, l) {
         linkLineWidth: d.linkLineWidth,
         valueFormat: d.valueFormat,
         valueSuffix: d.valueSuffix,
+        separatethousands: d.separatethousands,
         sankey: d.sankey,
         interactionState: d.interactionState
     };
@@ -255,6 +258,7 @@ function nodeModel(uniqueKeys, d, n) {
         tinyColorAlpha: tc.getAlpha(),
         valueFormat: d.valueFormat,
         valueSuffix: d.valueSuffix,
+        separatethousands: d.separatethousands,
         sankey: d.sankey,
         arrangement: d.arrangement,
         uniqueNodeLabelPathId: [d.guid, d.key, key].join(' '),