wip work for !diagonal.visible + !show(upper|lower)half

etpinard · etpinard · commit 571950e8997b · 2018-04-06T13:57:21.000-04:00
diff --git a/src/plots/plots.js b/src/plots/plots.js
@@ -291,7 +291,7 @@ plots.supplyDefaults = function(gd) {
 
     var context = gd._context || {};
 
-    var i, j;
+    var i;
 
     // Create all the storage space for frames, but only if doesn't already exist
     if(!gd._transitionData) plots.createTransitionData(gd);
@@ -366,8 +366,10 @@ plots.supplyDefaults = function(gd) {
     newFullLayout._modules = [];
     newFullLayout._basePlotModules = [];
     var subplots = newFullLayout._subplots = emptySubplotLists();
+
+    // initialize axis and subplot hash objects for splom-generated grids
     var splomAxes = newFullLayout._splomAxes = {x: {}, y: {}};
-    var splomSubplots = newFullLayout._splomSubplots = {}
+    var splomSubplots = newFullLayout._splomSubplots = {};
 
     // then do the data
     newFullLayout._globalTransforms = (gd._context || {}).globalTransforms;
diff --git a/src/traces/splom/defaults.js b/src/traces/splom/defaults.js
@@ -108,19 +108,20 @@ function handleDimensionsDefaults(traceIn, traceOut) {
 function handleAxisDefaults(traceIn, traceOut, layout, coerce) {
     var dimensions = traceOut.dimensions;
     var dimLength = dimensions.length;
-    var xaxesDflt = new Array(dimLength);
-    var yaxesDflt = new Array(dimLength);
     var i, j;
 
     var showUpper = traceOut.showupperhalf;
     var showLower = traceOut.showlowerhalf;
     var showDiagonal = traceOut.diagonal.visible;
 
-//     var axLen = !showDiagonal && (!showUpper || !showLower) ? 
-//         dimLength - 1 : 
-//         dimLength;
+    var axLength = !showDiagonal && (!showUpper || !showLower) ?
+        dimLength - 1 :
+        dimLength;
 
-    for(i = 0; i < dimLength; i++) {
+    var xaxesDflt = new Array(axLength);
+    var yaxesDflt = new Array(axLength);
+
+    for(i = 0; i < axLength; i++) {
         xaxesDflt[i] = 'x' + (i ? i + 1 : '');
         yaxesDflt[i] = 'y' + (i ? i + 1 : '');
     }
@@ -168,5 +169,6 @@ function handleAxisDefaults(traceIn, traceOut, layout, coerce) {
         }
     }
 
-//     console.log(Object.keys(layout._splomSubplots))
+    console.log(xaxes, yaxes);
+    console.log(Object.keys(layout._splomSubplots))
 }
