Renamed parcats.marker -> parcats.line

Renamed shape categories to `linear` and `hspline` and made `linear` the default.
jonmmease · Aug 7, 2018 · 7b75100 · 7b75100
1 parent 0c9c75f
commit 7b75100
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 36 deletions.
diff --git a/src/traces/parcats/attributes.js b/src/traces/parcats/attributes.js
@@ -12,19 +12,19 @@ var extendFlat = require('../../lib/extend').extendFlat;
 var colorAttributes = require('../../components/colorscale/attributes');
 
 var scatterAttrs = require('../scatter/attributes');
-var scatterMarkerAttrs = scatterAttrs.marker;
+var scatterLineAttrs = scatterAttrs.line;
 var colorbarAttrs = require('../../components/colorbar/attributes');
 
-var marker = extendFlat({
+var line = extendFlat({
     editType: 'calc'
-}, colorAttributes('marker', {editType: 'calc'}),
+}, colorAttributes('line', {editType: 'calc'}),
     {
-        showscale: scatterMarkerAttrs.showscale,
+        showscale: scatterLineAttrs.showscale,
         colorbar: colorbarAttrs,
         shape: {
             valType: 'enumerated',
-            values: ['straight', 'curved'],
-            dflt: 'curved',
+            values: ['linear', 'hspline'],
+            dflt: 'linear',
             role: 'info',
             editType: 'plot',
             description: 'Sets the shape of the paths'},
@@ -166,7 +166,7 @@ module.exports = {
         description: 'The dimensions (variables) of the parallel categories diagram.'
     },
 
-    marker: marker,
+    line: line,
     counts: {
         valType: 'number',
         min: 0,

diff --git a/src/traces/parcats/calc.js b/src/traces/parcats/calc.js
@@ -71,28 +71,28 @@ module.exports = function calc(gd, trace) {
 
     // Handle path colors
     // ------------------
-    var marker = trace.marker;
+    var line = trace.line;
     var markerColorscale;
 
     // Process colorscale
-    if(marker) {
-        if(hasColorscale(trace, 'marker')) {
-            colorscaleCalc(trace, trace.marker.color, 'marker', 'c');
+    if(line) {
+        if(hasColorscale(trace, 'line')) {
+            colorscaleCalc(trace, trace.line.color, 'line', 'c');
         }
-        markerColorscale = Drawing.tryColorscale(marker);
+        markerColorscale = Drawing.tryColorscale(line);
     } else {
         markerColorscale = Lib.identity;
     }
 
     // Build color generation function
     function getMarkerColorInfo(index) {
         var value;
-        if(!marker) {
+        if(!line) {
             value = parcatConstants.defaultColor;
-        } else if(Array.isArray(marker.color)) {
-            value = marker.color[index % marker.color.length];
+        } else if(Array.isArray(line.color)) {
+            value = line.color[index % line.color.length];
         } else {
-            value = marker.color;
+            value = line.color;
         }
 
         return {color: markerColorscale(value), rawColor: value};

diff --git a/src/traces/parcats/defaults.js b/src/traces/parcats/defaults.js
@@ -15,16 +15,16 @@ var colorbarDefaults = require('../../components/colorbar/defaults');
 
 function markerDefaults(traceIn, traceOut, defaultColor, layout, coerce) {
 
-    coerce('marker.color', defaultColor);
-
-    if(traceIn.marker) {
-        coerce('marker.cmin');
-        coerce('marker.cmax');
-        coerce('marker.cauto');
-        coerce('marker.colorscale');
-        coerce('marker.showscale');
-        coerce('marker.shape');
-        colorbarDefaults(traceIn.marker, traceOut.marker, layout);
+    coerce('line.color', defaultColor);
+
+    if(traceIn.line) {
+        coerce('line.cmin');
+        coerce('line.cmax');
+        coerce('line.cauto');
+        coerce('line.colorscale');
+        coerce('line.showscale');
+        coerce('line.shape');
+        colorbarDefaults(traceIn.line, traceOut.line, layout);
     }
 }
 
@@ -64,7 +64,7 @@ function dimensionsDefaults(traceIn, traceOut) {
 
         // Pass through catValues, catorder, and catlabels (validated in calc since this is where unique info is available)
 
-        // pass through marker (color, line)
+        // pass through line (color)
         // Pass through font
 
         commonLength = Math.min(commonLength, dimensionOut.values.length);

diff --git a/src/traces/parcats/parcats.js b/src/traces/parcats/parcats.js
@@ -1318,10 +1318,10 @@ function createParcatsViewModel(graphDiv, layout, wrappedParcatsModel) {
     // Handle path shape
     // -----------------
     var pathShape;
-    if(trace.marker && trace.marker.shape) {
-        pathShape = trace.marker.shape;
+    if(trace.line && trace.line.shape) {
+        pathShape = trace.line.shape;
     } else {
-        pathShape = 'curved';
+        pathShape = 'linear';
     }
 
     // Initialize parcatsViewModel
@@ -1582,7 +1582,7 @@ function updatePathViewModels(parcatsViewModel) {
 
         // build svg path
         var svgD;
-        if(parcatsViewModel.pathShape === 'curved') {
+        if(parcatsViewModel.pathShape === 'hspline') {
             svgD = buildSvgPath(leftXPositions, pathYs, dimWidths, pathHeight, 0.5);
         } else {
             svgD = buildSvgPath(leftXPositions, pathYs, dimWidths, pathHeight, 0);
@@ -1791,7 +1791,7 @@ function createDimensionViewModel(parcatsViewModel, dimensionModel) {
  *  If 'forward' then sort paths based on dimensions from left to right. If 'backward' sort based on dimensions
  *  from right to left
  * @property {String} pathShape
- *  The shape of the paths. Either 'straight' or 'curved'.
+ *  The shape of the paths. Either 'linear' or 'hspline'.
  * @property {DimensionViewModel|null} dragDimension
  *  Dimension currently being dragged. Null if no drag in progress
  * @property {Margin} margin

diff --git a/test/image/mocks/parcats_bundled.json b/test/image/mocks/parcats_bundled.json
@@ -7,7 +7,7 @@
         {"label": "Two", "values": ["A", "B", "A", "B", "C", "C", "A", "B", "C"]},
         {"label": "Three", "values": [11, 11, 11, 11, 11, 11, 11, 11, 11]}],
       "bundlecolors": true,
-      "marker": {
+      "line": {
         "color": [0, 0, 1, 1, 0, 1, 0, 0, 0]
       }
     }

diff --git a/test/image/mocks/parcats_bundled_reversed.json b/test/image/mocks/parcats_bundled_reversed.json
@@ -8,7 +8,7 @@
         {"label": "Three", "values": [11, 11, 11, 11, 11, 11, 11, 11, 11]}],
       "bundlecolors": true,
       "sortpaths": "backward",
-      "marker": {
+      "line": {
         "color": [0, 0, 1, 1, 0, 1, 0, 0, 0]
       }
     }

diff --git a/test/image/mocks/parcats_unbundled.json b/test/image/mocks/parcats_unbundled.json
@@ -7,9 +7,9 @@
         {"label": "Two", "values": ["A", "B", "A", "B", "C", "C", "A", "B", "C"]},
         {"label": "Three", "values": [11, 11, 11, 11, 11, 11, 11, 11, 11]}],
       "bundlecolors": false,
-      "marker": {
+      "line": {
         "color": [0, 0, 1, 1, 0, 1, 0, 0, 0],
-        "shape": "straight"
+        "shape": "hspline"
       }
     }
   ],