revise smith

plotly · Sep 29, 2021 · 60c30f4 · 60c30f4
1 parent 56e0a97
commit 60c30f4
Show file tree

Hide file tree

Showing 55 changed files with 1,561 additions and 1,880 deletions.
diff --git a/src/components/modebar/manage.js b/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'];
     }

diff --git a/src/plot_api/helpers.js b/src/plot_api/helpers.js
@@ -46,6 +46,7 @@ exports.cleanLayout = function(layout) {
 
     var axisAttrRegex = (Plots.subplotsRegistry.cartesian || {}).attrRegex;
     var polarAttrRegex = (Plots.subplotsRegistry.polar || {}).attrRegex;
+    var smithAttrRegex = (Plots.subplotsRegistry.smith || {}).attrRegex;
     var ternaryAttrRegex = (Plots.subplotsRegistry.ternary || {}).attrRegex;
     var sceneAttrRegex = (Plots.subplotsRegistry.gl3d || {}).attrRegex;
 
@@ -93,6 +94,11 @@ exports.cleanLayout = function(layout) {
 
             var polar = layout[key];
             cleanTitle(polar.radialaxis);
+        } else if(smithAttrRegex && smithAttrRegex.test(key)) {
+            // modifications for smith
+
+            var smith = layout[key];
+            cleanTitle(smith.realaxis);
         } else if(ternaryAttrRegex && ternaryAttrRegex.test(key)) {
             // modifications for ternary
 

diff --git a/src/plots/cartesian/axes.js b/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++) {

diff --git a/src/plots/cartesian/set_convert.js b/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

diff --git a/src/plots/cartesian/tick_mark_defaults.js b/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);

diff --git a/src/plots/plots.js b/src/plots/plots.js
@@ -2981,6 +2981,15 @@ plots.doCalcdata = function(gd, traces) {
         );
     }
 
+    // add smith axes to axis list
+    var smithIds = fullLayout._subplots.smith || [];
+    for(i = 0; i < smithIds.length; i++) {
+        axList.push(
+            fullLayout[smithIds[i]].realaxis,
+            fullLayout[smithIds[i]].imaginaryaxis
+        );
+    }
+
     // clear relinked cmin/cmax values in shared axes to start aggregation from scratch
     for(var k in fullLayout._colorAxes) {
         var cOpts = fullLayout[k];