no real axis title

archmoj · archmoj · commit bc8863cfb2d7 · 2021-09-30T16:59:14.000-04:00
diff --git a/src/plots/polar/polar.js b/src/plots/polar/polar.js
@@ -535,8 +535,9 @@ proto.updateRadialAxis = function(fullLayout, polarLayout) {
 };
 
 proto.updateRadialAxisTitle = function(fullLayout, polarLayout, _angle) {
+    if(this.isSmith) return;
+
     var _this = this;
-    var isSmith = this.isSmith;
     var gd = _this.gd;
     var radius = _this.radius;
     var cx = _this.cx;
@@ -560,21 +561,14 @@ proto.updateRadialAxisTitle = function(fullLayout, polarLayout, _angle) {
                 h + ts * 0.8;
     }
 
-    var x, y, angle;
-    if(isSmith) {
-        x = cx;
-        y = cy + pad;
-        angle = 0;
-    } else {
-        angle = _angle !== undefined ? _angle : _this.radialAxisAngle;
+    var angle = _angle !== undefined ? _angle : _this.radialAxisAngle;
 
-        var angleRad = deg2rad(angle);
-        var cosa = Math.cos(angleRad);
-        var sina = Math.sin(angleRad);
+    var angleRad = deg2rad(angle);
+    var cosa = Math.cos(angleRad);
+    var sina = Math.sin(angleRad);
 
-        x = cx + (radius / 2) * cosa + pad * sina;
-        y = cy - (radius / 2) * sina + pad * cosa;
-    }
+    var x = cx + (radius / 2) * cosa + pad * sina;
+    var y = cy - (radius / 2) * sina + pad * cosa;
 
     _this.layers['radial-axis-title'] = Titles.draw(gd, titleClass, {
         propContainer: radialLayout,
diff --git a/src/plots/smith/index.js b/src/plots/smith/index.js
@@ -50,7 +50,6 @@ function clean(newFullData, newFullLayout, oldFullData, oldFullLayout) {
 
         if(!newFullLayout[id] && !!oldSubplot) {
             oldSubplot.framework.remove();
-            oldSubplot.layers['radial-axis-title'].remove();
 
             for(var k in oldSubplot.clipPaths) {
                 oldSubplot.clipPaths[k].remove();
diff --git a/src/plots/smith/layout_attributes.js b/src/plots/smith/layout_attributes.js
@@ -73,13 +73,6 @@ var realAxisAttrs = {
         ].join(' ')
     },
 
-    title: {
-        text: extendFlat({}, axesAttrs.title.text, {editType: 'plot', dflt: ''}),
-        font: extendFlat({}, axesAttrs.title.font, {editType: 'plot'}),
-
-        editType: 'plot'
-    },
-
     editType: 'calc',
 };
 
diff --git a/src/plots/smith/layout_defaults.js b/src/plots/smith/layout_defaults.js
@@ -70,13 +70,6 @@ function handleDefaults(contIn, contOut, coerce, opts) {
         if(visible) {
             if(axName === 'realaxis') {
                 coerceAxis('side');
-
-                coerceAxis('title.text');
-                Lib.coerceFont(coerceAxis, 'title.font', {
-                    family: opts.font.family,
-                    size: Lib.bigFont(opts.font.size),
-                    color: dfltFontColor
-                });
             }
 
             coerceAxis('tickvals');
diff --git a/test/image/baselines/zzz_smith_blank.png b/test/image/baselines/zzz_smith_blank.png
diff --git a/test/image/baselines/zzz_smith_fills.png b/test/image/baselines/zzz_smith_fills.png
diff --git a/test/image/baselines/zzz_smith_modes.png b/test/image/baselines/zzz_smith_modes.png
diff --git a/test/image/baselines/zzz_smith_subplots.png b/test/image/baselines/zzz_smith_subplots.png
diff --git a/test/image/mocks/zzz_smith_blank.json b/test/image/mocks/zzz_smith_blank.json
@@ -42,11 +42,7 @@
         "y": [0.56, 1]
       },
       "realaxis": {
-        "side": "top",
-        "title": {
-          "text": "real title",
-          "font": { "size": 20 }
-        }
+        "side": "top"
       }
     },
     "smith2": {
@@ -73,10 +69,6 @@
         "y": [0.56, 1]
       },
       "realaxis": {
-        "title": {
-          "text": "real title",
-          "font": { "color": "red" }
-        },
         "ticks": "top",
         "side": "bottom"
       },
diff --git a/test/image/mocks/zzz_smith_fills.json b/test/image/mocks/zzz_smith_fills.json
@@ -39,10 +39,7 @@
       },
       "realaxis": {
         "ticks": "top",
-        "side": "bottom",
-        "title": {
-          "text": "Real axis<br>Title"
-        }
+        "side": "bottom"
       },
       "imaginaryaxis": {
         "ticks": "outside"
@@ -55,10 +52,7 @@
       },
       "realaxis": {
         "ticks": "top",
-        "side": "top",
-        "title": {
-          "text": "Real axis<br>Title"
-        }
+        "side": "top"
       },
       "imaginaryaxis": {
         "ticks": "inside"
diff --git a/test/image/mocks/zzz_smith_modes.json b/test/image/mocks/zzz_smith_modes.json
@@ -91,13 +91,6 @@
         "tickfont": {
           "color": "white"
         },
-        "title": {
-          "text": "$E=mc^2$",
-          "font": {
-            "size": 40,
-            "color": "yellow"
-          }
-        },
         "gridcolor": "blue",
         "linecolor": "white",
         "linewidth": 3,
diff --git a/test/image/mocks/zzz_smith_subplots.json b/test/image/mocks/zzz_smith_subplots.json
@@ -44,14 +44,7 @@
         "x": [0, 0.44]
       },
       "realaxis": {
-        "showgrid": false,
-        "title": {
-          "text": "1st subplot",
-          "font": {
-            "size": 50,
-            "color": "orange"
-          }
-        }
+        "showgrid": false
       }
     },
     "smith2": {
@@ -60,15 +53,6 @@
       },
       "imaginaryaxis": {
         "showgrid": false
-      },
-      "realaxis": {
-        "title": {
-          "text": "2nd subplot",
-          "font": {
-            "size": 25,
-            "color": "blue"
-          }
-        }
       }
     }
   }
diff --git a/test/jasmine/tests/smith_test.js b/test/jasmine/tests/smith_test.js
@@ -10,7 +10,6 @@ var d3SelectAll = require('../../strict-d3').selectAll;
 var createGraphDiv = require('../assets/create_graph_div');
 var destroyGraphDiv = require('../assets/destroy_graph_div');
 
-var negateIf = require('../assets/negate_if');
 var mouseEvent = require('../assets/mouse_event');
 var click = require('../assets/click');
 var doubleClick = require('../assets/double_click');
@@ -58,7 +57,6 @@ describe('Test smith plots defaults:', function() {
         expect(layoutOut.smith.imaginaryaxis.linecolor).toBe('red');
         expect(layoutOut.smith.imaginaryaxis.gridcolor).toBe('rgb(255, 153, 153)', 'blend by 60% with bgcolor');
 
-        expect(layoutOut.smith.realaxis.title.font.color).toBe('blue');
         expect(layoutOut.smith.realaxis.linecolor).toBe('blue');
         expect(layoutOut.smith.realaxis.gridcolor).toBe('rgb(153, 153, 255)', 'blend by 60% with bgcolor');
     });
@@ -219,53 +217,6 @@ describe('Test relayout on smith subplots:', function() {
         .then(done, done.fail);
     });
 
-    it('should be able to restyle radial axis title', function(done) {
-        var gd = createGraphDiv();
-        var lastBBox;
-
-        function assertTitle(content, didBBoxChanged) {
-            var radialAxisTitle = d3Select('g.g-smithtitle');
-            var txt = radialAxisTitle.select('text');
-            var bb = radialAxisTitle.node().getBBox();
-            var newBBox = [bb.x, bb.y, bb.width, bb.height];
-
-            if(content === '') {
-                expect(txt.size()).toBe(0, 'cleared <text>');
-            } else {
-                expect(txt.text()).toBe(content, 'real axis title');
-            }
-
-            negateIf(didBBoxChanged, expect(newBBox)).toEqual(lastBBox, 'did bbox change');
-            lastBBox = newBBox;
-        }
-
-        Plotly.newPlot(gd, [{
-            type: 'scattersmith',
-            real: [1, 2, 3],
-            imag: [0, 0, 0]
-        }], {
-            smith: {
-                realaxis: {title: 'yo'}
-            }
-        })
-        .then(function() {
-            assertTitle('yo', true);
-            return Plotly.relayout(gd, 'smith.realaxis.title.text', '');
-        })
-        .then(function() {
-            assertTitle('', true);
-            return Plotly.relayout(gd, 'smith.realaxis.title.text', 'yo2');
-        })
-        .then(function() {
-            assertTitle('yo2', true);
-            return Plotly.relayout(gd, 'smith.realaxis.title.font.color', 'red');
-        })
-        .then(function() {
-            assertTitle('yo2', false);
-        })
-        .then(done, done.fail);
-    });
-
     it('should clean up its framework, clip paths and info layers when getting deleted', function(done) {
         var gd = createGraphDiv();
         var fig = Lib.extendDeep({}, basicMock);
@@ -274,7 +225,6 @@ describe('Test relayout on smith subplots:', function() {
 
         function _assert(exp) {
             expect(d3SelectAll('g.smith').size()).toBe(exp.subplot, '# subplot layer');
-            expect(d3SelectAll('g.g-smithtitle').size()).toBe(exp.rtitle, '# radial title');
 
             var clipCnt = 0;
             d3SelectAll('clipPath').each(function() {
@@ -284,17 +234,17 @@ describe('Test relayout on smith subplots:', function() {
         }
 
         Plotly.newPlot(gd, fig).then(function() {
-            _assert({subplot: 1, clip: 1, rtitle: 1});
+            _assert({subplot: 1, clip: 1});
 
             return Plotly.deleteTraces(gd, inds);
         })
         .then(function() {
-            _assert({subplot: 0, clip: 0, rtitle: 0});
+            _assert({subplot: 0, clip: 0});
 
             return Plotly.addTraces(gd, traces);
         })
         .then(function() {
-            _assert({subplot: 1, clip: 1, rtitle: 1});
+            _assert({subplot: 1, clip: 1});
         })
         .then(done, done.fail);
     });
diff --git a/test/plot-schema.json b/test/plot-schema.json
@@ -7846,37 +7846,6 @@
       "min": 0,
       "valType": "number"
      },
-     "title": {
-      "editType": "plot",
-      "font": {
-       "color": {
-        "editType": "ticks",
-        "valType": "color"
-       },
-       "description": "Sets this axis' title font. Note that the title's font used to be customized by the now deprecated `titlefont` attribute.",
-       "editType": "plot",
-       "family": {
-        "description": "HTML font family - the typeface that will be applied by the web browser. The web browser will only be able to apply a font if it is available on the system which it operates. Provide multiple font families, separated by commas, to indicate the preference in which to apply fonts if they aren't available on the system. The Chart Studio Cloud (at https://chart-studio.plotly.com or on-premise) generates images on a server, where only a select number of fonts are installed and supported. These include *Arial*, *Balto*, *Courier New*, *Droid Sans*,, *Droid Serif*, *Droid Sans Mono*, *Gravitas One*, *Old Standard TT*, *Open Sans*, *Overpass*, *PT Sans Narrow*, *Raleway*, *Times New Roman*.",
-        "editType": "ticks",
-        "noBlank": true,
-        "strict": true,
-        "valType": "string"
-       },
-       "role": "object",
-       "size": {
-        "editType": "ticks",
-        "min": 1,
-        "valType": "number"
-       }
-      },
-      "role": "object",
-      "text": {
-       "description": "Sets the title of this axis. Note that before the existence of `title.text`, the title's contents used to be defined as the `title` attribute itself. This behavior has been deprecated.",
-       "dflt": "",
-       "editType": "plot",
-       "valType": "string"
-      }
-     },
      "visible": {
       "description": "A single toggle to hide the axis while preserving interaction like dragging. Default is true when a cheater plot is present on the axis, otherwise false",
       "dflt": true,
