a little more stuff contourcarpet can inherit from contour

Author: alexcjohnson

src/traces/contour/index.js

@@ -14,7 +14,7 @@ var Contour = {};
 Contour.attributes = require('./attributes');
 Contour.supplyDefaults = require('./defaults');
 Contour.calc = require('./calc');
-Contour.plot = require('./plot');
+Contour.plot = require('./plot').plot;
 Contour.style = require('./style');
 Contour.colorbar = require('./colorbar');
 Contour.hoverPoints = require('./hover');

src/traces/contour/plot.js

@@ -25,7 +25,7 @@ var constants = require('./constants');
 var costConstants = constants.LABELOPTIMIZER;
 
 
-module.exports = function plot(gd, plotinfo, cdcontours) {
+exports.plot = function plot(gd, plotinfo, cdcontours) {
     for(var i = 0; i < cdcontours.length; i++) {
         plotOne(gd, plotinfo, cdcontours[i]);
     }
@@ -82,7 +82,7 @@ function plotOne(gd, plotinfo, cd) {
         ];
 
     // draw everything
-    var plotGroup = makeContourGroup(plotinfo, cd, id);
+    var plotGroup = exports.makeContourGroup(plotinfo, cd, id);
     makeBackground(plotGroup, perimeter, contours);
     makeFills(plotGroup, pathinfo, perimeter, contours);
     makeLinesAndLabels(plotGroup, pathinfo, gd, cd[0], contours, perimeter);
@@ -123,7 +123,7 @@ function emptyPathinfo(contours, plotinfo, cd0) {
     }
     return pathinfo;
 }
-function makeContourGroup(plotinfo, cd, id) {
+exports.makeContourGroup = function(plotinfo, cd, id) {
     var plotgroup = plotinfo.plot.select('.maplayer')
         .selectAll('g.contour.' + id)
         .data(cd);
@@ -135,7 +135,7 @@ function makeContourGroup(plotinfo, cd, id) {
     plotgroup.exit().remove();
 
     return plotgroup;
-}
+};
 
 function makeBackground(plotgroup, perimeter, contours) {
     var bggroup = plotgroup.selectAll('g.contourbg').data([0]);
@@ -278,7 +278,7 @@ function makeLinesAndLabels(plotgroup, pathinfo, gd, cd0, contours, perimeter) {
     // if we're showing labels, because the fill paths include the perimeter
     // so can't be used to position the labels correctly.
     // In this case we'll remove the lines after making the labels.
-    var linegroup = createLines(lineContainer, showLines || showLabels, pathinfo);
+    var linegroup = exports.createLines(lineContainer, showLines || showLabels, pathinfo);
 
     var lineClip = createLineClip(lineContainer, clipLinesForLabels,
         gd._fullLayout._defs, cd0.trace.uid);
@@ -358,7 +358,7 @@ function makeLinesAndLabels(plotgroup, pathinfo, gd, cd0, contours, perimeter) {
     if(showLabels && !showLines) linegroup.remove();
 }
 
-function createLines(lineContainer, makeLines, pathinfo) {
+exports.createLines = function(lineContainer, makeLines, pathinfo) {
     var smoothing = pathinfo[0].smoothing;
 
     var linegroup = lineContainer.selectAll('g.contourlevel')
@@ -369,8 +369,10 @@ function createLines(lineContainer, makeLines, pathinfo) {
         .classed('contourlevel', true);
 
     if(makeLines) {
+        // pedgepaths / ppaths are used by contourcarpet, for the paths transformed from a/b to x/y
+        // edgepaths / paths are used by contour since it's in x/y from the start
         var opencontourlines = linegroup.selectAll('path.openline')
-            .data(function(d) { return d.edgepaths; });
+            .data(function(d) { return d.pedgepaths || d.edgepaths; });
 
         opencontourlines.exit().remove();
         opencontourlines.enter().append('path')
@@ -384,7 +386,7 @@ function createLines(lineContainer, makeLines, pathinfo) {
             .style('vector-effect', 'non-scaling-stroke');
 
         var closedcontourlines = linegroup.selectAll('path.closedline')
-            .data(function(d) { return d.paths; });
+            .data(function(d) { return d.ppaths || d.paths; });
 
         closedcontourlines.exit().remove();
         closedcontourlines.enter().append('path')
@@ -399,7 +401,7 @@ function createLines(lineContainer, makeLines, pathinfo) {
     }
 
     return linegroup;
-}
+};
 
 function createLineClip(lineContainer, clipLinesForLabels, defs, uid) {
     var clipId = clipLinesForLabels ? ('clipline' + uid) : null;

src/traces/contourcarpet/plot.js

@@ -15,6 +15,7 @@ var Drawing = require('../../components/drawing');
 
 var makeCrossings = require('../contour/make_crossings');
 var findAllPaths = require('../contour/find_all_paths');
+var contourPlot = require('../contour/plot');
 var convertToConstraints = require('./convert_to_constraints');
 var joinAllPaths = require('./join_all_paths');
 var emptyPathinfo = require('./empty_pathinfo');
@@ -95,7 +96,7 @@ function plotOne(gd, plotinfo, cd) {
     mapPathinfo(pathinfo, ab2p);
 
     // draw everything
-    var plotGroup = makeContourGroup(plotinfo, cd, id);
+    var plotGroup = contourPlot.makeContourGroup(plotinfo, cd, id);
 
     // Compute the boundary path
     var seg, xp, yp, i;
@@ -131,52 +132,9 @@ function clipBoundary(plotGroup, carpet) {
     plotGroup.attr('clip-path', 'url(#' + carpet.clipPathId + ')');
 }
 
-function makeContourGroup(plotinfo, cd, id) {
-    var plotgroup = plotinfo.plot.select('.maplayer')
-        .selectAll('g.contour.' + id)
-        .classed('trace', true)
-        .data(cd);
-
-    plotgroup.enter().append('g')
-        .classed('contour', true)
-        .classed(id, true);
-
-    plotgroup.exit().remove();
-
-    return plotgroup;
-}
-
 function makeLines(plotgroup, pathinfo, contours) {
-    var smoothing = pathinfo[0].smoothing;
-
-    var linegroup = plotgroup.selectAll('g.contourlevel')
-        .data(contours.showlines === false ? [] : pathinfo);
-    linegroup.enter().append('g')
-        .classed('contourlevel', true);
-    linegroup.exit().remove();
-
-    var opencontourlines = linegroup.selectAll('path.openline')
-        .data(function(d) { return d.pedgepaths; });
-    opencontourlines.enter().append('path')
-        .classed('openline', true);
-    opencontourlines.exit().remove();
-    opencontourlines
-        .attr('d', function(d) {
-            return Drawing.smoothopen(d, smoothing);
-        })
-        .style('vector-effect', 'non-scaling-stroke');
-
-    var closedcontourlines = linegroup.selectAll('path.closedline')
-        .data(function(d) { return d.ppaths; });
-    closedcontourlines.enter().append('path')
-        .classed('closedline', true);
-    closedcontourlines.exit().remove();
-    closedcontourlines
-        .attr('d', function(d) {
-            return Drawing.smoothclosed(d, smoothing);
-        })
-        .style('vector-effect', 'non-scaling-stroke')
-        .style('stroke-miterlimit', 1);
+    contourPlot.createLines(plotgroup,
+        contours.showlines !== false, pathinfo);
 }
 
 function makeBackground(plotgroup, clipsegments, xaxis, yaxis, isConstraint, coloring) {