inherit imaginary tickvals default from real axis

 - and use 0.2, 0.5, 1, 2, 5 set for tickvals

Author: archmoj

src/plots/smith/constants.js

@@ -4,6 +4,9 @@ module.exports = {
     attr: 'subplot',
     name: 'smith',
 
-    axisNames: ['imaginaryaxis', 'realaxis'],
+    axisNames: [
+        'realaxis',
+        'imaginaryaxis' // imaginary axis should be second here so that the `tickvals` defaults could be inherited from realaxis
+    ],
     axisName2dataArray: {imaginaryaxis: 'imag', realaxis: 'real'},
 };

src/plots/smith/layout_attributes.js

@@ -35,10 +35,7 @@ var realAxisAttrs = extendFlat({
     visible: extendFlat({}, axesAttrs.visible, {dflt: true}),
 
     tickvals: {
-        dflt: [
-            0.2, 0.4, 0.6, 0.8,
-            1, 1.5, 2, 3, 4, 5, 10, 20
-        ],
+        dflt: [0.2, 0.5, 1, 2, 5],
         valType: 'data_array',
         editType: 'plot',
         description: 'Sets the values at which ticks on this axis appear.'
@@ -76,15 +73,12 @@ var imaginaryAxisAttrs = extendFlat({
     visible: extendFlat({}, axesAttrs.visible, {dflt: true}),
 
     tickvals: {
-        dflt: [
-            -20, -10, -5, -4, -3, -2, -1.5, -1,
-            -0.8, -0.6, -0.4, -0.2,
-            0, 0.2, 0.4, 0.6, 0.8,
-            1, 1.5, 2, 3, 4, 5, 10, 20
-        ],
         valType: 'data_array',
         editType: 'plot',
-        description: 'Sets the values at which ticks on this axis appear.'
+        description: [
+            'Sets the values at which ticks on this axis appear.',
+            'Defaults to `realaxis.tickvals` plus the same as negatives and zero.'
+        ].join(' ')
     },
 
     ticks: axesAttrs.ticks,

src/plots/smith/layout_defaults.js

@@ -52,7 +52,17 @@ function handleDefaults(contIn, contOut, coerce, opts) {
             var isRealAxis = axName === 'realaxis';
             if(isRealAxis) coerceAxis('side');
 
-            coerceAxis('tickvals');
+            if(isRealAxis) {
+                coerceAxis('tickvals');
+            } else {
+                var realTickvals = contOut.realaxis.tickvals || layoutAttributes.realaxis.tickvals.dflt;
+                var imagTickvalsDflt =
+                    realTickvals.slice().reverse().map(function(x) { return -x; })
+                    .concat([0])
+                    .concat(realTickvals);
+
+                coerceAxis('tickvals', imagTickvalsDflt);
+            }
 
             var dfltColor;
             var dfltFontColor;

test/image/baselines/smith_blank.png

@@ -21,6 +21,11 @@
       "l": 40
     },
     "width": 800,
-    "height": 800
+    "height": 800,
+    "smith": {
+      "realaxis": {
+        "tickvals": [0.2, 0.4, 0.6, 0.8, 1, 1.5, 2, 3, 4, 5, 10, 20]
+      }
+    }
   }
 }

test/image/baselines/smith_fills.png

@@ -141,19 +141,19 @@ describe('Test relayout on smith subplots:', function() {
             return Plotly.relayout(gd, 'smith.realaxis', {ticks: 'top'});
         })
         .then(function() {
-            check(12, 'M0,-0.5v-5');
+            check(5, 'M0,-0.5v-5');
             return Plotly.relayout(gd, 'smith.realaxis', {ticks: 'bottom'});
         })
         .then(function() {
-            check(12, 'M0,0.5v5');
+            check(5, 'M0,0.5v5');
             return Plotly.relayout(gd, 'smith.realaxis', {ticks: ''});
         })
         .then(function() {
             check(0);
             return Plotly.relayout(gd, 'smith.realaxis', {ticks: 'top'});
         })
         .then(function() {
-            check(12, 'M0,-0.5v-5');
+            check(5, 'M0,-0.5v-5');
         })
         .then(done, done.fail);
     });

test/image/baselines/smith_gaps.png

@@ -7510,34 +7510,7 @@
       "valType": "string"
      },
      "tickvals": {
-      "description": "Sets the values at which ticks on this axis appear.",
-      "dflt": [
-       -20,
-       -10,
-       -5,
-       -4,
-       -3,
-       -2,
-       -1.5,
-       -1,
-       -0.8,
-       -0.6,
-       -0.4,
-       -0.2,
-       0,
-       0.2,
-       0.4,
-       0.6,
-       0.8,
-       1,
-       1.5,
-       2,
-       3,
-       4,
-       5,
-       10,
-       20
-      ],
+      "description": "Sets the values at which ticks on this axis appear. Defaults to `realaxis.tickvals` plus the same as negatives and zero.",
       "editType": "plot",
       "valType": "data_array"
      },
@@ -7735,17 +7708,10 @@
       "description": "Sets the values at which ticks on this axis appear.",
       "dflt": [
        0.2,
-       0.4,
-       0.6,
-       0.8,
+       0.5,
        1,
-       1.5,
        2,
-       3,
-       4,
-       5,
-       10,
-       20
+       5
       ],
       "editType": "plot",
       "valType": "data_array"
@@ -56451,7 +56417,7 @@
      "valType": "string"
     },
     "imag": {
-     "description": "Sets the imaginary coordinates",
+     "description": "Sets the imaginary component of the data, in units of normalized impedance such that real=1, imag=0 is the center of the chart.",
      "editType": "calc+clearAxisTypes",
      "valType": "data_array"
     },
@@ -57806,7 +57772,7 @@
      "valType": "number"
     },
     "real": {
-     "description": "Sets the real coordinates",
+     "description": "Sets the real component of the data, in units of normalized impedance such that real=1, imag=0 is the center of the chart.",
      "editType": "calc+clearAxisTypes",
      "valType": "data_array"
     },