Merge pull request #5956 from plotly/smith-prototype

Introduce `smith` subplot and `scattersmith` trace type

Author: archmoj

lib/index.js

@@ -50,6 +50,7 @@ Plotly.register([
     require('./scatterpolar'),
     require('./scatterpolargl'),
     require('./barpolar'),
+    require('./scattersmith'),
 
     // transforms
     require('./aggregate'),

lib/scattersmith.js

@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = require('../src/traces/scattersmith');

src/components/modebar/manage.js

@@ -110,6 +110,7 @@ function getButtonGroups(gd) {
     var hasTernary = fullLayout._has('ternary');
     var hasMapbox = fullLayout._has('mapbox');
     var hasPolar = fullLayout._has('polar');
+    var hasSmith = fullLayout._has('smith');
     var hasSankey = fullLayout._has('sankey');
     var allAxesFixed = areAllAxesFixed(fullLayout);
     var hasUnifiedHoverLabel = isUnifiedHover(fullLayout.hovermode);
@@ -152,7 +153,7 @@ function getButtonGroups(gd) {
     var resetGroup = [];
     var dragModeGroup = [];
 
-    if((hasCartesian || hasGL2D || hasPie || hasFunnelarea || hasTernary) + hasGeo + hasGL3D + hasMapbox + hasPolar > 1) {
+    if((hasCartesian || hasGL2D || hasPie || hasFunnelarea || hasTernary) + hasGeo + hasGL3D + hasMapbox + hasPolar + hasSmith > 1) {
         // graphs with more than one plot types get 'union buttons'
         // which reset the view or toggle hover labels across all subplots.
         hoverGroup = ['toggleHover'];
@@ -175,7 +176,7 @@ function getButtonGroups(gd) {
     } else if(hasSankey) {
         hoverGroup = ['hoverClosestCartesian', 'hoverCompareCartesian'];
         resetGroup = ['resetViewSankey'];
-    } else { // hasPolar, hasTernary
+    } else { // hasPolar, hasSmith, hasTernary
         // always show at least one hover icon.
         hoverGroup = ['toggleHover'];
     }

src/plot_api/plot_api.js

@@ -3729,6 +3729,9 @@ function makePlotFramework(gd) {
     // single polar layer for the whole plot
     fullLayout._polarlayer = fullLayout._paper.append('g').classed('polarlayer', true);
 
+    // single smith layer for the whole plot
+    fullLayout._smithlayer = fullLayout._paper.append('g').classed('smithlayer', true);
+
     // single ternary layer for the whole plot
     fullLayout._ternarylayer = fullLayout._paper.append('g').classed('ternarylayer', true);
 

src/plots/cartesian/axes.js

@@ -1462,7 +1462,7 @@ function formatDate(ax, out, hover, extraPrecision) {
                 dateStr += '<br>' + headStr;
             } else {
                 var isInside = insideTicklabelposition(ax);
-                var side = ax._realSide || ax.side; // polar mocks the side of the radial axis
+                var side = ax._trueSide || ax.side; // polar mocks the side of the radial axis
                 if(
                     (!isInside && side === 'top') ||
                     (isInside && side === 'bottom')
@@ -3269,7 +3269,7 @@ axes.drawLabels = function(gd, ax, opts) {
                 var pad = !isAligned ? 0 :
                     (ax.tickwidth || 0) + 2 * TEXTPAD;
 
-                var rotate90 = (tickSpacing < maxFontSize * 2.5) || ax.type === 'multicategory';
+                var rotate90 = (tickSpacing < maxFontSize * 2.5) || ax.type === 'multicategory' || ax._name === 'realaxis';
 
                 // any overlap at all - set 30 degrees or 90 degrees
                 for(i = 0; i < lbbArray.length - 1; i++) {

src/plots/cartesian/set_convert.js

@@ -449,6 +449,7 @@ module.exports = function setConvert(ax, fullLayout) {
 
         if(ax.type === 'date') dflt = Lib.dfltRange(ax.calendar);
         else if(axLetter === 'y') dflt = constants.DFLTRANGEY;
+        else if(ax._name === 'realaxis') dflt = [0, 1];
         else dflt = opts.dfltRange || constants.DFLTRANGEX;
 
         // make sure we don't later mutate the defaults

src/plots/cartesian/tick_label_defaults.js

@@ -27,7 +27,8 @@ module.exports = function handleTickLabelDefaults(containerIn, containerOut, coe
             size: font.size,
             color: dfltFontColor
         });
-        coerce('tickangle');
+
+        if(!options.noAng) coerce('tickangle');
 
         if(axType !== 'category') {
             var tickFormat = coerce('tickformat');
@@ -41,7 +42,7 @@ module.exports = function handleTickLabelDefaults(containerIn, containerOut, coe
                 delete containerOut.tickformatstops;
             }
 
-            if(!tickFormat && axType !== 'date') {
+            if(!options.noExp && !tickFormat && axType !== 'date') {
                 coerce('showexponent', showAttrDflt);
                 coerce('exponentformat');
                 coerce('minexponent');

src/plots/cartesian/tick_mark_defaults.js

@@ -8,7 +8,7 @@ var layoutAttributes = require('./layout_attributes');
 /**
  * options: inherits outerTicks from axes.handleAxisDefaults
  */
-module.exports = function handleTickDefaults(containerIn, containerOut, coerce, options) {
+module.exports = function handleTickMarkDefaults(containerIn, containerOut, coerce, options) {
     var tickLen = Lib.coerce2(containerIn, containerOut, layoutAttributes, 'ticklen');
     var tickWidth = Lib.coerce2(containerIn, containerOut, layoutAttributes, 'tickwidth');
     var tickColor = Lib.coerce2(containerIn, containerOut, layoutAttributes, 'tickcolor', containerOut.color);

src/plots/polar/layout_defaults.js

@@ -62,14 +62,6 @@ function handleDefaults(contIn, contOut, coerce, opts) {
 
         coerceAxis('uirevision', contOut.uirevision);
 
-        var dfltColor;
-        var dfltFontColor;
-
-        if(visible) {
-            dfltColor = coerceAxis('color');
-            dfltFontColor = (dfltColor === axIn.color) ? dfltColor : opts.font.color;
-        }
-
         // We don't want to make downstream code call ax.setScale,
         // as both radial and angular axes don't have a set domain.
         // Furthermore, angular axes don't have a set range.
@@ -91,18 +83,6 @@ function handleDefaults(contIn, contOut, coerce, opts) {
 
                 coerceAxis('range');
                 axOut.cleanRange('range', {dfltRange: [0, 1]});
-
-                if(visible) {
-                    coerceAxis('side');
-                    coerceAxis('angle', sector[0]);
-
-                    coerceAxis('title.text');
-                    Lib.coerceFont(coerceAxis, 'title.font', {
-                        family: opts.font.family,
-                        size: Lib.bigFont(opts.font.size),
-                        color: dfltFontColor
-                    });
-                }
                 break;
 
             case 'angularaxis':
@@ -142,20 +122,27 @@ function handleDefaults(contIn, contOut, coerce, opts) {
         });
 
         if(visible) {
+            var dfltColor;
+            var dfltFontColor;
+            var dfltFontSize;
+            var dfltFontFamily;
+            var font = opts.font || {};
+
+            dfltColor = coerceAxis('color');
+            dfltFontColor = (dfltColor === axIn.color) ? dfltColor : font.color;
+            dfltFontSize = font.size;
+            dfltFontFamily = font.family;
+
             handleTickValueDefaults(axIn, axOut, coerceAxis, axOut.type);
-            handleTickLabelDefaults(axIn, axOut, coerceAxis, axOut.type);
-            handleTickMarkDefaults(axIn, axOut, coerceAxis, {outerTicks: true});
+            handleTickLabelDefaults(axIn, axOut, coerceAxis, axOut.type, {
+                font: {
+                    color: dfltFontColor,
+                    size: dfltFontSize,
+                    family: dfltFontFamily
+                }
+            });
 
-            var showTickLabels = coerceAxis('showticklabels');
-            if(showTickLabels) {
-                Lib.coerceFont(coerceAxis, 'tickfont', {
-                    family: opts.font.family,
-                    size: opts.font.size,
-                    color: dfltFontColor
-                });
-                coerceAxis('tickangle');
-                coerceAxis('tickformat');
-            }
+            handleTickMarkDefaults(axIn, axOut, coerceAxis, {outerTicks: true});
 
             handleLineGridDefaults(axIn, axOut, coerceAxis, {
                 dfltColor: dfltColor,
@@ -170,6 +157,18 @@ function handleDefaults(contIn, contOut, coerce, opts) {
             });
 
             coerceAxis('layer');
+
+            if(axName === 'radialaxis') {
+                coerceAxis('side');
+                coerceAxis('angle', sector[0]);
+
+                coerceAxis('title.text');
+                Lib.coerceFont(coerceAxis, 'title.font', {
+                    color: dfltFontColor,
+                    size: Lib.bigFont(dfltFontSize),
+                    family: dfltFontFamily
+                });
+            }
         }
 
         if(axType !== 'category') coerceAxis('hoverformat');