Remove sector attribute

waxlamp · waxlamp · commit 8ace040ea4ab · 2021-08-13T18:29:44.000-04:00
diff --git a/src/plots/smith/layout_attributes.js b/src/plots/smith/layout_attributes.js
@@ -139,21 +139,6 @@ module.exports = {
 
     domain: domainAttrs({name: 'smith', editType: 'plot'}),
 
-    sector: {
-        valType: 'info_array',
-        items: [
-            {valType: 'number', editType: 'plot'},
-            {valType: 'number', editType: 'plot'}
-        ],
-        dflt: [0, 360],
-        editType: 'plot',
-        description: [
-            'Sets angular span of this smith subplot with two angles (in degrees).',
-            'Sector are assumed to be spanned in the counterclockwise direction',
-            'with *0* corresponding to rightmost limit of the smith subplot.'
-        ].join(' ')
-    },
-
     bgcolor: {
         valType: 'color',
         editType: 'plot',
diff --git a/src/plots/smith/layout_defaults.js b/src/plots/smith/layout_defaults.js
@@ -19,8 +19,6 @@ function handleDefaults(contIn, contOut, coerce, opts) {
     var bgColor = coerce('bgcolor');
     opts.bgColor = Color.combine(bgColor, opts.paper_bgcolor);
 
-    coerce('sector');
-
     // could optimize, subplotData is not always needed!
     var subplotData = getSubplotData(opts.fullData, constants.name, opts.id);
     var layoutOut = opts.layoutOut;
diff --git a/src/plots/smith/set_convert.js b/src/plots/smith/set_convert.js
@@ -170,30 +170,17 @@ function setConvertAngular(ax, smithLayout) {
 
     // N.B. we mock the axis 'range' here
     ax.setGeometry = function() {
-        var sector = smithLayout.sector;
-        var sectorInRad = sector.map(deg2rad);
-        var dir = {clockwise: -1, counterclockwise: 1}[ax.direction];
-        var rot = deg2rad(ax.rotation);
-
-        var rad2g = function(v) { return dir * v + rot; };
-        var g2rad = function(v) { return (v - rot) / dir; };
+        var rad2g = function(v) { return v; };
+        var g2rad = function(v) { return v; };
 
         var rad2c, c2rad;
         var rad2t, t2rad;
 
-        switch(axType) {
-            case 'linear':
-                c2rad = rad2c = Lib.identity;
-                t2rad = deg2rad;
-                rad2t = rad2deg;
-
-                // Set the angular range in degrees to make auto-tick computation cleaner,
-                // changing rotation/direction should not affect the angular tick value.
-                ax.range = Lib.isFullCircle(sectorInRad) ?
-                    [sector[0], sector[0] + 360] :
-                    sectorInRad.map(g2rad).map(rad2deg);
-                break;
-        }
+        c2rad = rad2c = Lib.identity;
+        t2rad = deg2rad;
+        rad2t = rad2deg;
+
+        ax.range = [0, 360];
 
         ax.c2g = function(v) { return rad2g(c2rad(v)); };
         ax.g2c = function(v) { return rad2c(g2rad(v)); };
diff --git a/src/plots/smith/smith.js b/src/plots/smith/smith.js
@@ -195,9 +195,9 @@ proto.updateLayout = function(fullLayout, smithLayout) {
     var xLength = _this.xLength = gs.w * (xDomain[1] - xDomain[0]);
     var yLength = _this.yLength = gs.h * (yDomain[1] - yDomain[0]);
     // sector to plot
-    var sector = smithLayout.sector;
+    var sector = [0, 360];
     _this.sectorInRad = sector.map(deg2rad);
-    var sectorBBox = _this.sectorBBox = computeSectorBBox(sector);
+    var sectorBBox = _this.sectorBBox = [-1, -1, 1, 1];
     var dxSectorBBox = sectorBBox[2] - sectorBBox[0];
     var dySectorBBox = sectorBBox[3] - sectorBBox[1];
     // aspect ratios
@@ -349,7 +349,7 @@ proto.updateRadialAxis = function(fullLayout, smithLayout) {
     var cx = _this.cx;
     var cy = _this.cy;
     var radialLayout = smithLayout.realaxis;
-    var a0 = mod(smithLayout.sector[0], 360);
+    var a0 = 0;
     var ax = _this.radialAxis;
     var hasRoomForIt = true;
 
@@ -1043,61 +1043,6 @@ function strTickLayout(axLayout) {
     return out;
 }
 
-// Finds the bounding box of a given circle sector,
-// inspired by https://math.stackexchange.com/q/1852703
-//
-// assumes:
-// - sector[0] < sector[1]
-// - counterclockwise rotation
-function computeSectorBBox(sector) {
-    var s0 = sector[0];
-    var s1 = sector[1];
-    var arc = s1 - s0;
-    var a0 = mod(s0, 360);
-    var a1 = a0 + arc;
-
-    var ax0 = Math.cos(deg2rad(a0));
-    var ay0 = Math.sin(deg2rad(a0));
-    var ax1 = Math.cos(deg2rad(a1));
-    var ay1 = Math.sin(deg2rad(a1));
-
-    var x0, y0, x1, y1;
-
-    if((a0 <= 90 && a1 >= 90) || (a0 > 90 && a1 >= 450)) {
-        y1 = 1;
-    } else if(ay0 <= 0 && ay1 <= 0) {
-        y1 = 0;
-    } else {
-        y1 = Math.max(ay0, ay1);
-    }
-
-    if((a0 <= 180 && a1 >= 180) || (a0 > 180 && a1 >= 540)) {
-        x0 = -1;
-    } else if(ax0 >= 0 && ax1 >= 0) {
-        x0 = 0;
-    } else {
-        x0 = Math.min(ax0, ax1);
-    }
-
-    if((a0 <= 270 && a1 >= 270) || (a0 > 270 && a1 >= 630)) {
-        y0 = -1;
-    } else if(ay0 >= 0 && ay1 >= 0) {
-        y0 = 0;
-    } else {
-        y0 = Math.min(ay0, ay1);
-    }
-
-    if(a1 >= 360) {
-        x1 = 1;
-    } else if(ax0 <= 0 && ax1 <= 0) {
-        x1 = 0;
-    } else {
-        x1 = Math.max(ax0, ax1);
-    }
-
-    return [x0, y0, x1, y1];
-}
-
 function snapToVertexAngle(a, vangles) {
     var fn = function(v) { return Lib.angleDist(a, v); };
     var ind = Lib.findIndexOfMin(vangles, fn);
