Add calc prioritization

rreusser · rreusser · commit 17a6b521c29e · 2017-01-20T11:05:38.000-05:00
diff --git a/lib/contourcarpet.js b/lib/contourcarpet.js
@@ -0,0 +1,11 @@
+/**
+* Copyright 2012-2017, Plotly, Inc.
+* All rights reserved.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*/
+
+'use strict';
+
+module.exports = require('../src/traces/contourcarpet');
diff --git a/lib/index.js b/lib/index.js
@@ -37,6 +37,7 @@ Plotly.register([
 
     require('./carpet'),
     require('./scattercarpet'),
+    require('./contourcarpet'),
 
     require('./ohlc'),
     require('./candlestick')
diff --git a/src/plots/plots.js b/src/plots/plots.js
@@ -1996,11 +1996,27 @@ plots.doCalcdata = function(gd, traces) {
         }
     }
 
-    // 'regular' loop
+    // Look up priorities
+    var priority;
+    var prioritizedFullDataLookup = [];
+    var hasPriorities = false;
     for(i = 0; i < fullData.length; i++) {
+        trace = fullData[i];
+        _module = trace._module;
+        priority = (_module && _module.calcPriority) ? _module.calcPriority : 0;
+        hasPriorities = hasPriorities || priority;
+        prioritizedFullDataLookup.push({index: i, priority: priority});
+    }
+
+    // Sort by priority descending so that higher priority is computed first:
+    if(hasPriorities) prioritizedFullDataLookup.sort(function(a, b) { return b.priority - a.priority; });
+
+    // 'regular' loop
+    for(i = 0; i < prioritizedFullDataLookup.length; i++) {
+        var index = prioritizedFullDataLookup[i].index;
         var cd = [];
 
-        trace = fullData[i];
+        trace = fullData[index];
 
         if(trace.visible === true) {
             _module = trace._module;
@@ -2024,6 +2040,6 @@ plots.doCalcdata = function(gd, traces) {
         if(!cd[0].t) cd[0].t = {};
         cd[0].trace = trace;
 
-        calcdata[i] = cd;
+        calcdata[index] = cd;
     }
 };
diff --git a/src/traces/carpet/index.js b/src/traces/carpet/index.js
@@ -16,6 +16,7 @@ Carpet.supplyDefaults = require('./defaults');
 Carpet.plot = require('./plot');
 Carpet.calc = require('./calc');
 Carpet.animatable = true;
+Carpet.calcPriority = 1;
 
 Carpet.moduleType = 'trace';
 Carpet.name = 'carpet';
diff --git a/src/traces/contourcarpet/attributes.js b/src/traces/contourcarpet/attributes.js
@@ -0,0 +1,32 @@
+/**
+* Copyright 2012-2016, Plotly, Inc.
+* All rights reserved.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*/
+
+'use strict';
+
+var scatterAttrs = require('../scatter/attributes');
+var plotAttrs = require('../../plots/attributes');
+var colorAttributes = require('../../components/colorscale/color_attributes');
+var colorbarAttrs = require('../../components/colorbar/attributes');
+
+var extendFlat = require('../../lib/extend').extendFlat;
+
+var scatterMarkerAttrs = scatterAttrs.marker,
+    scatterLineAttrs = scatterAttrs.line,
+    scatterMarkerLineAttrs = scatterMarkerAttrs.line;
+
+module.exports = {
+    carpetid: {
+        valType: 'string',
+        role: 'info',
+        description: [
+            'An identifier for this carpet, so that `scattercarpet` and',
+            '`scattercontour` traces can specify a carpet plot on which',
+            'they lie'
+        ].join(' ')
+    },
+};
diff --git a/src/traces/contourcarpet/defaults.js b/src/traces/contourcarpet/defaults.js
@@ -0,0 +1,32 @@
+/**
+* Copyright 2012-2016, Plotly, Inc.
+* All rights reserved.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*/
+
+
+'use strict';
+
+var Lib = require('../../lib');
+
+var constants = require('../scatter/constants');
+var subTypes = require('../scatter/subtypes');
+var handleMarkerDefaults = require('../scatter/marker_defaults');
+var handleLineDefaults = require('../scatter/line_defaults');
+var handleLineShapeDefaults = require('../scatter/line_shape_defaults');
+var handleTextDefaults = require('../scatter/text_defaults');
+var handleFillColorDefaults = require('../scatter/fillcolor_defaults');
+
+var attributes = require('./attributes');
+
+
+module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
+    function coerce(attr, dflt) {
+        return Lib.coerce(traceIn, traceOut, attributes, attr, dflt);
+    }
+
+    coerce('carpetid');
+
+};
diff --git a/src/traces/contourcarpet/index.js b/src/traces/contourcarpet/index.js
@@ -0,0 +1,31 @@
+/**
+* Copyright 2012-2016, Plotly, Inc.
+* All rights reserved.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*/
+
+'use strict';
+
+var ContourCarpet = {};
+
+ContourCarpet.attributes = require('./attributes');
+ContourCarpet.supplyDefaults = require('./defaults');
+// ContourCarpet.colorbar = require('../scatter/colorbar');
+// ContourCarpet.calc = require('./calc');
+ContourCarpet.plot = require('./plot');
+// ContourCarpet.style = require('./style');
+// ContourCarpet.hoverPoints = require('./hover');
+// ContourCarpet.selectPoints = require('./select');
+
+ContourCarpet.moduleType = 'trace';
+ContourCarpet.name = 'contourcarpet';
+ContourCarpet.basePlotModule = require('../../plots/cartesian');
+ContourCarpet.categories = ['carpet', 'symbols', 'markerColorscale', 'showLegend'];
+ContourCarpet.meta = {
+    hrName: 'contour_carpet',
+    description: [].join(' ')
+};
+
+module.exports = ContourCarpet;
diff --git a/src/traces/contourcarpet/plot.js b/src/traces/contourcarpet/plot.js
@@ -0,0 +1,16 @@
+/**
+* Copyright 2012-2016, Plotly, Inc.
+* All rights reserved.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*/
+
+'use strict';
+
+var scatterPlot = require('../scatter/plot');
+var Axes = require('../../plots/cartesian/axes');
+
+module.exports = function plot(gd, plotinfoproxy, data) {
+    var i, trace, node;
+};
