rename new dragmodes as well as modebar button names

archmoj · archmoj · commit a58539412618 · 2020-04-20T19:18:37.000-04:00
diff --git a/src/components/dragelement/helpers.js b/src/components/dragelement/helpers.js
@@ -17,35 +17,35 @@ exports.selectMode = function(dragmode) {
 
 exports.drawMode = function(dragmode) {
     return (
-        dragmode === 'closedfreedraw' ||
-        dragmode === 'openfreedraw' ||
-        dragmode === 'linedraw' ||
-        dragmode === 'rectdraw' ||
-        dragmode === 'ellipsedraw'
+        dragmode === 'drawclosedpath' ||
+        dragmode === 'drawopenpath' ||
+        dragmode === 'drawline' ||
+        dragmode === 'drawrect' ||
+        dragmode === 'drawcircle'
     );
 };
 
 exports.openMode = function(dragmode) {
     return (
-        dragmode === 'linedraw' ||
-        dragmode === 'openfreedraw'
+        dragmode === 'drawline' ||
+        dragmode === 'drawopenpath'
     );
 };
 
 exports.rectMode = function(dragmode) {
     return (
         dragmode === 'select' ||
-        dragmode === 'linedraw' ||
-        dragmode === 'rectdraw' ||
-        dragmode === 'ellipsedraw'
+        dragmode === 'drawline' ||
+        dragmode === 'drawrect' ||
+        dragmode === 'drawcircle'
     );
 };
 
 exports.freeMode = function(dragmode) {
     return (
         dragmode === 'lasso' ||
-        dragmode === 'closedfreedraw' ||
-        dragmode === 'openfreedraw'
+        dragmode === 'drawclosedpath' ||
+        dragmode === 'drawopenpath'
     );
 };
 
diff --git a/src/components/fx/layout_attributes.js b/src/components/fx/layout_attributes.js
@@ -49,11 +49,11 @@ module.exports = {
             'pan',
             'select',
             'lasso',
-            'closedfreedraw',
-            'openfreedraw',
-            'linedraw',
-            'rectdraw',
-            'ellipsedraw',
+            'drawclosedpath',
+            'drawopenpath',
+            'drawline',
+            'drawrect',
+            'drawcircle',
             'orbit',
             'turntable',
             false
diff --git a/src/components/modebar/buttons.js b/src/components/modebar/buttons.js
@@ -134,48 +134,48 @@ modeBarButtons.lasso2d = {
     click: handleCartesian
 };
 
-modeBarButtons.closedfreedraw = {
-    name: 'closedfreedraw',
+modeBarButtons.drawclosedpath = {
+    name: 'drawclosedpath',
     title: function(gd) { return _(gd, 'Draw Closed Freeform'); },
     attr: 'dragmode',
-    val: 'closedfreedraw',
-    icon: Icons.closedfreedraw,
+    val: 'drawclosedpath',
+    icon: Icons.drawclosedpath,
     click: handleCartesian
 };
 
-modeBarButtons.openfreedraw = {
-    name: 'openfreedraw',
+modeBarButtons.drawopenpath = {
+    name: 'drawopenpath',
     title: function(gd) { return _(gd, 'Draw Open Freeform'); },
     attr: 'dragmode',
-    val: 'openfreedraw',
-    icon: Icons.openfreedraw,
+    val: 'drawopenpath',
+    icon: Icons.drawopenpath,
     click: handleCartesian
 };
 
-modeBarButtons.linedraw = {
-    name: 'linedraw',
+modeBarButtons.drawline = {
+    name: 'drawline',
     title: function(gd) { return _(gd, 'Draw Line'); },
     attr: 'dragmode',
-    val: 'linedraw',
-    icon: Icons.linedraw,
+    val: 'drawline',
+    icon: Icons.drawline,
     click: handleCartesian
 };
 
-modeBarButtons.rectdraw = {
-    name: 'rectdraw',
+modeBarButtons.drawrect = {
+    name: 'drawrect',
     title: function(gd) { return _(gd, 'Draw Rectangle'); },
     attr: 'dragmode',
-    val: 'rectdraw',
-    icon: Icons.rectdraw,
+    val: 'drawrect',
+    icon: Icons.drawrect,
     click: handleCartesian
 };
 
-modeBarButtons.ellipsedraw = {
-    name: 'ellipsedraw',
+modeBarButtons.drawcircle = {
+    name: 'drawcircle',
     title: function(gd) { return _(gd, 'Draw Ellipse'); },
     attr: 'dragmode',
-    val: 'ellipsedraw',
-    icon: Icons.ellipsedraw,
+    val: 'drawcircle',
+    icon: Icons.drawcircle,
     click: handleCartesian
 };
 
diff --git a/src/components/modebar/manage.js b/src/components/modebar/manage.js
@@ -176,11 +176,11 @@ function getButtonGroups(gd) {
         fullLayout._has('cartesian')
     ) {
         dragModeGroup.push(
-            'linedraw',
-            'openfreedraw',
-            'closedfreedraw',
-            'ellipsedraw',
-            'rectdraw',
+            'drawline',
+            'drawopenpath',
+            'drawclosedpath',
+            'drawcircle',
+            'drawrect',
             'eraseshape'
         );
     }
diff --git a/src/fonts/ploticon.js b/src/fonts/ploticon.js
@@ -111,13 +111,13 @@ module.exports = {
         'path': 'm214-7h429v214h-429v-214z m500 0h72v500q0 8-6 21t-11 20l-157 156q-5 6-19 12t-22 5v-232q0-22-15-38t-38-16h-322q-22 0-37 16t-16 38v232h-72v-714h72v232q0 22 16 38t37 16h465q22 0 38-16t15-38v-232z m-214 518v178q0 8-5 13t-13 5h-107q-7 0-13-5t-5-13v-178q0-8 5-13t13-5h107q7 0 13 5t5 13z m357-18v-518q0-22-15-38t-38-16h-750q-23 0-38 16t-16 38v750q0 22 16 38t38 16h517q23 0 50-12t42-26l156-157q16-15 27-42t11-49z',
         'transform': 'matrix(1 0 0 -1 0 850)'
     },
-    'openfreedraw': {
+    'drawopenpath': {
         'width': 70,
         'height': 70,
         'path': 'M33.21,85.65a7.31,7.31,0,0,1-2.59-.48c-8.16-3.11-9.27-19.8-9.88-41.3-.1-3.58-.19-6.68-.35-9-.15-2.1-.67-3.48-1.43-3.79-2.13-.88-7.91,2.32-12,5.86L3,32.38c1.87-1.64,11.55-9.66,18.27-6.9,2.13.87,4.75,3.14,5.17,9,.17,2.43.26,5.59.36,9.25a224.17,224.17,0,0,0,1.5,23.4c1.54,10.76,4,12.22,4.48,12.4.84.32,2.79-.46,5.76-3.59L43,80.07C41.53,81.57,37.68,85.64,33.21,85.65ZM74.81,69a11.34,11.34,0,0,0,6.09-6.72L87.26,44.5,74.72,32,56.9,38.35c-2.37.86-5.57,3.42-6.61,6L38.65,72.14l8.42,8.43ZM55,46.27a7.91,7.91,0,0,1,3.64-3.17l14.8-5.3,8,8L76.11,60.6l-.06.19a6.37,6.37,0,0,1-3,3.43L48.25,74.59,44.62,71Zm16.57,7.82A6.9,6.9,0,1,0,64.64,61,6.91,6.91,0,0,0,71.54,54.09Zm-4.05,0a2.85,2.85,0,1,1-2.85-2.85A2.86,2.86,0,0,1,67.49,54.09Zm-4.13,5.22L60.5,56.45,44.26,72.7l2.86,2.86ZM97.83,35.67,84.14,22l-8.57,8.57L89.26,44.24Zm-13.69-8,8,8-2.85,2.85-8-8Z',
         'transform': 'matrix(1 0 0 1 -15 -15)'
     },
-    'closedfreedraw': {
+    'drawclosedpath': {
         'width': 90,
         'height': 90,
         'path': 'M88.41,21.12a26.56,26.56,0,0,0-36.18,0l-2.07,2-2.07-2a26.57,26.57,0,0,0-36.18,0,23.74,23.74,0,0,0,0,34.8L48,90.12a3.22,3.22,0,0,0,4.42,0l36-34.21a23.73,23.73,0,0,0,0-34.79ZM84,51.24,50.16,83.35,16.35,51.25a17.28,17.28,0,0,1,0-25.47,20,20,0,0,1,27.3,0l4.29,4.07a3.23,3.23,0,0,0,4.44,0l4.29-4.07a20,20,0,0,1,27.3,0,17.27,17.27,0,0,1,0,25.46ZM66.76,47.68h-33v6.91h33ZM53.35,35H46.44V68h6.91Z',
@@ -135,19 +135,19 @@ module.exports = {
         'path': 'm0 850l0-143 143 0 0 143-143 0z m286 0l0-143 143 0 0 143-143 0z m285 0l0-143 143 0 0 143-143 0z m286 0l0-143 143 0 0 143-143 0z m-857-286l0-143 143 0 0 143-143 0z m857 0l0-143 143 0 0 143-143 0z m-857-285l0-143 143 0 0 143-143 0z m857 0l0-143 143 0 0 143-143 0z m-857-286l0-143 143 0 0 143-143 0z m286 0l0-143 143 0 0 143-143 0z m285 0l0-143 143 0 0 143-143 0z m286 0l0-143 143 0 0 143-143 0z',
         'transform': 'matrix(1 0 0 -1 0 850)'
     },
-    'linedraw': {
+    'drawline': {
         'width': 70,
         'height': 70,
         'path': 'M60.64,62.3a11.29,11.29,0,0,0,6.09-6.72l6.35-17.72L60.54,25.31l-17.82,6.4c-2.36.86-5.57,3.41-6.6,6L24.48,65.5l8.42,8.42ZM40.79,39.63a7.89,7.89,0,0,1,3.65-3.17l14.79-5.31,8,8L61.94,54l-.06.19a6.44,6.44,0,0,1-3,3.43L34.07,68l-3.62-3.63Zm16.57,7.81a6.9,6.9,0,1,0-6.89,6.9A6.9,6.9,0,0,0,57.36,47.44Zm-4,0a2.86,2.86,0,1,1-2.85-2.85A2.86,2.86,0,0,1,53.32,47.44Zm-4.13,5.22L46.33,49.8,30.08,66.05l2.86,2.86ZM83.65,29,70,15.34,61.4,23.9,75.09,37.59ZM70,21.06l8,8-2.84,2.85-8-8ZM87,80.49H10.67V87H87Z',
         'transform': 'matrix(1 0 0 1 -15 -15)'
     },
-    'rectdraw': {
+    'drawrect': {
         'width': 80,
         'height': 80,
         'path': 'M78,22V79H21V22H78m9-9H12V88H87V13ZM68,46.22H31V54H68ZM53,32H45.22V69H53Z',
         'transform': 'matrix(1 0 0 1 -10 -10)'
     },
-    'ellipsedraw': {
+    'drawcircle': {
         'width': 80,
         'height': 80,
         'path': 'M50,84.72C26.84,84.72,8,69.28,8,50.3S26.84,15.87,50,15.87,92,31.31,92,50.3,73.16,84.72,50,84.72Zm0-60.59c-18.6,0-33.74,11.74-33.74,26.17S31.4,76.46,50,76.46,83.74,64.72,83.74,50.3,68.6,24.13,50,24.13Zm17.15,22h-34v7.11h34Zm-13.8-13H46.24v34h7.11Z',
diff --git a/src/plots/cartesian/new_shape.js b/src/plots/cartesian/new_shape.js
@@ -645,20 +645,20 @@ function addNewShapes(outlines, dragOptions) {
         if(id < gd._fullLayout.shapes.length) {
             switch(gd._fullLayout.shapes[id].type) {
                 case 'rect':
-                    dragmode = 'rectdraw';
+                    dragmode = 'drawrect';
                     break;
                 case 'circle':
-                    dragmode = 'ellipsedraw';
+                    dragmode = 'drawcircle';
                     break;
                 case 'line':
-                    dragmode = 'linedraw';
+                    dragmode = 'drawline';
                     break;
                 case 'path':
                     var path = gd._fullLayout.shapes[id].path || '';
                     if(path[path.length - 1] === 'Z') {
-                        dragmode = 'closedfreedraw';
+                        dragmode = 'drawclosedpath';
                     } else {
-                        dragmode = 'openfreedraw';
+                        dragmode = 'drawopenpath';
                     }
                     break;
             }
@@ -695,7 +695,7 @@ function addNewShapes(outlines, dragOptions) {
         }
 
         if(
-            dragmode === 'rectdraw' &&
+            dragmode === 'drawrect' &&
             pointsShapeRectangle(cell)
         ) {
             shape.type = 'rect';
@@ -704,15 +704,15 @@ function addNewShapes(outlines, dragOptions) {
             shape.x1 = cell[2][1];
             shape.y1 = cell[2][2];
         } else if(
-            dragmode === 'linedraw'
+            dragmode === 'drawline'
         ) {
             shape.type = 'line';
             shape.x0 = cell[0][1];
             shape.y0 = cell[0][2];
             shape.x1 = cell[1][1];
             shape.y1 = cell[1][2];
         } else if(
-            dragmode === 'ellipsedraw' &&
+            dragmode === 'drawcircle' &&
             (isActiveShape === false || pointsShapeEllipse(cell))
         ) {
             shape.type = 'circle'; // an ellipse!
diff --git a/src/plots/cartesian/select.js b/src/plots/cartesian/select.js
@@ -59,8 +59,8 @@ function prepSelect(e, startX, startY, dragOptions, mode) {
     var isDrawMode = drawMode(mode);
     var isSelectMode = selectMode(mode);
 
-    var isLine = mode === 'linedraw';
-    var isEllipse = mode === 'ellipsedraw';
+    var isLine = mode === 'drawline';
+    var isEllipse = mode === 'drawcircle';
     var isLineOrEllipse = isLine || isEllipse; // cases with two start & end positions
 
     var gd = dragOptions.gd;
diff --git a/src/plots/layout_attributes.js b/src/plots/layout_attributes.js
@@ -514,7 +514,7 @@ module.exports = {
             dflt: 'diagonal',
             editType: 'none',
             description: [
-                'When `dragmode` is set to *rectdraw*, *linedraw* or *ellipsedraw*',
+                'When `dragmode` is set to *drawrect*, *drawline* or *drawcircle*',
                 'this limits the drag to be horizontal, vertical or diagonal.',
                 'Using *diagonal* there is no limit e.g. in drawing lines in any direction.',
                 '*ortho* limits the draw to be either horizontal or vertical.',
