use splom label to default splom ax titles

++ fix and lock 1-dimension splom bug

Author: etpinard

src/components/grid/index.js

@@ -167,7 +167,7 @@ var gridAttrs = {
 
 function getAxes(layout, grid, axLetter) {
     var gridVal = grid[axLetter + 'axes'];
-    var splomVal = layout[{x: '_splomXaxes', y: '_splomYaxes'}[axLetter]] || [];
+    var splomVal = Object.keys((layout._splomAxes || {})[axLetter] || {});
 
     if(Array.isArray(gridVal)) return gridVal;
     if(splomVal.length) return splomVal;

src/plots/cartesian/axis_defaults.js

@@ -34,6 +34,7 @@ var orderedCategories = require('./ordered_categories');
  */
 module.exports = function handleAxisDefaults(containerIn, containerOut, coerce, options, layoutOut) {
     var letter = options.letter;
+    var id = containerOut._id;
     var font = options.font || {};
 
     var visible = coerce('visible', !options.cheateronly);
@@ -74,8 +75,10 @@ module.exports = function handleAxisDefaults(containerIn, containerOut, coerce,
     // if axis.color was provided, use it for fonts too; otherwise,
     // inherit from global font color in case that was provided.
     var dfltFontColor = (dfltColor === containerIn.color) ? dfltColor : font.color;
+    // try to get default title from splom trace, fallback to graph-wide value
+    var dfltTitle = ((layoutOut._splomAxes || {})[letter] || {})[id] || layoutOut._dfltTitle[letter];
 
-    coerce('title', layoutOut._dfltTitle[letter]);
+    coerce('title', dfltTitle);
     Lib.coerceFont(coerce, 'titlefont', {
         family: font.family,
         size: Math.round(font.size * 1.2),

src/plots/plots.js

@@ -364,23 +364,24 @@ plots.supplyDefaults = function(gd) {
     newFullLayout._modules = [];
     newFullLayout._basePlotModules = [];
     var subplots = newFullLayout._subplots = emptySubplotLists();
-    var splomXaxes = newFullLayout._splomXaxes = [];
-    var splomYaxes = newFullLayout._splomYaxes = [];
+    var splomAxes = newFullLayout._splomAxes = {x: {}, y: {}};
 
     // then do the data
     newFullLayout._globalTransforms = (gd._context || {}).globalTransforms;
     plots.supplyDataDefaults(newData, newFullData, newLayout, newFullLayout);
 
     // redo grid size defaults with info about splom x/y axes,
     // and fill in generated cartesian axes and subplots
-    if(splomXaxes.length && splomYaxes.length) {
+    var splomXa = Object.keys(splomAxes.x);
+    var splomYa = Object.keys(splomAxes.y);
+    if(splomXa.length > 1 && splomYa.length > 1) {
         Registry.getComponentMethod('grid', 'sizeDefaults')(newLayout, newFullLayout);
 
-        for(i = 0; i < splomXaxes.length; i++) {
-            Lib.pushUnique(subplots.xaxis, splomXaxes[i]);
-            for(j = 0; j < splomYaxes.length; j++) {
-                if(i === 0) Lib.pushUnique(subplots.yaxis, splomYaxes[j]);
-                Lib.pushUnique(subplots.cartesian, splomXaxes[i] + splomYaxes[j]);
+        for(i = 0; i < splomXa.length; i++) {
+            Lib.pushUnique(subplots.xaxis, splomXa[i]);
+            for(j = 0; j < splomYa.length; j++) {
+                if(i === 0) Lib.pushUnique(subplots.yaxis, splomYa[j]);
+                Lib.pushUnique(subplots.cartesian, splomXa[i] + splomYa[j]);
             }
         }
     }

src/traces/splom/defaults.js

@@ -101,7 +101,8 @@ function handleDimensionsDefaults(traceIn, traceOut) {
 }
 
 function handleAxisDefaults(traceIn, traceOut, layout, coerce) {
-    var dimLength = traceOut.dimensions.length;
+    var dimensions = traceOut.dimensions;
+    var dimLength = dimensions.length;
     var xaxesDflt = new Array(dimLength);
     var yaxesDflt = new Array(dimLength);
     var i;
@@ -116,10 +117,16 @@ function handleAxisDefaults(traceIn, traceOut, layout, coerce) {
 
     // TODO what to do when xaxes.length or yaxes.length !== dimLength ???
 
-    for(i = 0; i < xaxes.length; i++) {
-        Lib.pushUnique(layout._splomXaxes, xaxes[i]);
-    }
-    for(i = 0; i < yaxes.length; i++) {
-        Lib.pushUnique(layout._splomYaxes, yaxes[i]);
+    for(i = 0; i < dimLength; i++) {
+        var dim = dimensions[i];
+        var xa = xaxes[i];
+        var ya = yaxes[i];
+
+        if(!(xa in layout._splomAxes.x)) {
+            layout._splomAxes.x[xa] = dim.label || '';
+        }
+        if(!(ya in layout._splomAxes.y)) {
+            layout._splomAxes.y[ya] = dim.label || '';
+        }
     }
 }

test/jasmine/tests/splom_test.js

@@ -36,7 +36,15 @@ describe('Test splom trace defaults:', function() {
     });
 
     it('should work with only one dimensions', function() {
-        // TODO this breaks at the moment
+        _supply({
+            dimensions: [
+                {values: [2, 1, 2]}
+            ]
+        });
+
+        var fullLayout = gd._fullLayout;
+        expect(fullLayout.xaxis.domain).toBeCloseToArray([0, 1]);
+        expect(fullLayout.yaxis.domain).toBeCloseToArray([0, 1]);
     });
 
     it('should set `grid.xaxes` and `grid.yaxes` default using the new of dimensions', function() {
@@ -102,7 +110,21 @@ describe('Test splom trace defaults:', function() {
     });
 
     it('should set axis title default using dimensions *label*', function() {
-        // TODO
+        _supply({
+            dimensions: [{
+                label: 'A',
+                values: [2, 3, 1]
+            }, {
+                label: 'B',
+                values: [1, 2, 1]
+            }]
+        });
+
+        var fullLayout = gd._fullLayout;
+        expect(fullLayout.xaxis.title).toBe('A');
+        expect(fullLayout.yaxis.title).toBe('A');
+        expect(fullLayout.xaxis2.title).toBe('B');
+        expect(fullLayout.yaxis2.title).toBe('B');
     });
 
     it('should lead to correct axis auto type value', function() {