Skip to content

Remove explict dependency on Pie module from plot routine #187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 19, 2016
Merged

Remove explict dependency on Pie module from plot routine #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d885974
rename 'module' key '_module':
etpinard Jan 15, 2016
64ce076
don't call Pie.plot in subplot loop:
etpinard Jan 15, 2016
2981ebb
rm explicit dependency on Pie in plot routine
etpinard Jan 15, 2016
002557b
lint
etpinard Jan 15, 2016
be2e6c9
use getModule instead hidden attr
etpinard Jan 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 20 additions & 14 deletions src/plot_api/plot_api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ var Queue = require('../lib/queue');
var Plots = require('../plots/plots');
var Fx = require('../plots/cartesian/graph_interact');

var Pie = require('../traces/pie');

var Color = require('../components/color');
var Drawing = require('../components/drawing');
var ErrorBars = require('../components/errorbars');
Expand Down Expand Up @@ -268,12 +266,16 @@ Plotly.plot = function(gd, data, layout, config) {

function getCdModule(cdSubplot, _module) {
var cdModule = [];
var i, cd, trace;
for (i = 0; i < cdSubplot.length; i++) {
cd = cdSubplot[i];
trace = cd[0].trace;
if (trace._module === _module && trace.visible === true) cdModule.push(cd);

for(var i = 0; i < cdSubplot.length; i++) {
var cd = cdSubplot[i];
var trace = cd[0].trace;

if((trace._module === _module) && (trace.visible === true)) {
cdModule.push(cd);
}
}

return cdModule;
}

Expand Down Expand Up @@ -301,7 +303,7 @@ Plotly.plot = function(gd, data, layout, config) {

for (i = 0; i < subplots.length; i++) {
subplot = subplots[i];
subplotInfo = gd._fullLayout._plots[subplot];
subplotInfo = fullLayout._plots[subplot];
cdSubplot = getCdSubplot(calcdata, subplot);
cdError = [];

Expand All @@ -312,7 +314,8 @@ Plotly.plot = function(gd, data, layout, config) {

for(j = 0; j < modules.length; j++) {
_module = modules[j];
if(!_module.plot) continue;

if(!_module.plot && (_module.name === 'pie')) continue;

// plot all traces of this type on this subplot at once
cdModule = getCdModule(cdSubplot, _module);
Expand All @@ -326,16 +329,19 @@ Plotly.plot = function(gd, data, layout, config) {
}

// finally do all error bars at once
if(gd._fullLayout._hasCartesian) {
if(fullLayout._hasCartesian) {
ErrorBars.plot(gd, subplotInfo, cdError);
Lib.markTime('done ErrorBars');
}
}

// now draw stuff not on subplots (ie, pies)
// TODO: gotta be a better way to handle this
var cdPie = getCdModule(calcdata, Pie);
if(cdPie.length) Pie.plot(gd, cdPie);
// now draw stuff not on subplots (ie, only pies at the moment)
if(fullLayout._hasPie) {
var Pie = Plots.getModule('pie');
var cdPie = getCdModule(calcdata, Pie);

if(cdPie.length) Pie.plot(gd, cdPie);
}

// styling separate from drawing
Plots.style(gd);
Expand Down
6 changes: 3 additions & 3 deletions src/plots/plots.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ plots.register = function(_module, thisType, categoriesIn, meta) {
}

modules[thisType] = {
module: _module,
_module: _module,
categories: categoryObj
};

Expand All @@ -79,7 +79,7 @@ plots.getModule = function(trace) {

var _module = modules[getTraceType(trace)];
if(!_module) return false;
return _module.module;
return _module._module;
};


Expand Down Expand Up @@ -678,7 +678,7 @@ plots.supplyLayoutModuleDefaults = function(layoutIn, layoutOut, fullData) {
// trace module layout defaults
var traceTypes = Object.keys(modules);
for(i = 0; i < traceTypes.length; i++) {
_module = modules[allTypes[i]].module;
_module = modules[allTypes[i]]._module;

if(_module.supplyLayoutDefaults) {
_module.supplyLayoutDefaults(layoutIn, layoutOut, fullData);
Expand Down