Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Plot promises fixups #52

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 7 commits into from
Dec 2, 2015
Merged

Plot promises fixups #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b2f6b22
wrap d3.json requet in geo.plot in promise,
etpinard Nov 30, 2015
e849327
make Plotly.newPlot return a promise:
etpinard Nov 30, 2015
cf95a06
lint
etpinard Nov 30, 2015
f099117
add error message when topojson file isn't found
etpinard Nov 30, 2015
ecc0395
handler error in get-topojson Promise with reject
etpinard Dec 2, 2015
f5384ba
update comment about streaming on maps
etpinard Dec 2, 2015
c2969da
replace reject(Error()) by reject(new Error())
etpinard Dec 2, 2015
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
42 changes: 21 additions & 21 deletions src/plot_api/plot_api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ Plotly.plot = function(gd, data, layout, config) {
return plots.previousPromises(gd);
}

function marginPushersAgain(){
function marginPushersAgain() {
// in case the margins changed, draw margin pushers again
var seq = JSON.stringify(fullLayout._size)===oldmargins ?
[] : [marginPushers, layoutStyles];
Expand Down Expand Up @@ -335,7 +335,7 @@ Plotly.plot = function(gd, data, layout, config) {
return plots.previousPromises(gd);
}

function cleanUp(){
function cleanUp() {
// now we're REALLY TRULY done plotting...
// so mark it as done and let other procedures call a replot
gd._replotting = false;
Expand Down Expand Up @@ -484,7 +484,7 @@ function plotGeo(gd) {
fullLayout[geoId]._geo = geo;
}

geo.plot(fullGeoData, fullLayout);
geo.plot(fullGeoData, fullLayout, gd._promises);
}
}

Expand Down Expand Up @@ -570,7 +570,7 @@ function plotPolar(gd, data, layout) {
if(txt === '' || !txt) opacity = 0;
var placeholderText = 'Click to enter title';

var titleLayout = function(){
var titleLayout = function() {
this.call(Plotly.util.convertToTspans);
//TODO: html/mathjax
//TODO: center title
Expand All @@ -586,17 +586,17 @@ function plotPolar(gd, data, layout) {
title.attr({'data-unformatted': placeholderText})
.text(placeholderText)
.style({opacity: opacity})
.on('mouseover.opacity',function(){
.on('mouseover.opacity',function() {
d3.select(this).transition().duration(100)
.style('opacity',1);
})
.on('mouseout.opacity',function(){
.on('mouseout.opacity',function() {
d3.select(this).transition().duration(1000)
.style('opacity',0);
});
}

var setContenteditable = function(){
var setContenteditable = function() {
this.call(Plotly.util.makeEditable)
.on('edit', function(text){
gd.framework({layout: {title: text}});
Expand All @@ -605,7 +605,7 @@ function plotPolar(gd, data, layout) {
.call(titleLayout);
this.call(setContenteditable);
})
.on('cancel', function(){
.on('cancel', function() {
var txt = this.attr('data-unformatted');
this.text(txt).call(titleLayout);
});
Expand Down Expand Up @@ -940,7 +940,7 @@ Plotly.redraw = function(gd) {
Plotly.newPlot = function (gd, data, layout, config) {
gd = getGraphDiv(gd);
plots.purge(gd);
Plotly.plot(gd, data, layout, config);
return Plotly.plot(gd, data, layout, config);
};

function doCalcdata(gd) {
Expand Down Expand Up @@ -1747,7 +1747,7 @@ Plotly.restyle = function restyle(gd, astr, val, traces) {
}

// make a new empty vals array for undoit
function a0(){ return traces.map(function(){ return undefined; }); }
function a0() { return traces.map(function() { return undefined; }); }

// for autoranging multiple axes
function addToAxlist(axid) {
Expand All @@ -1764,11 +1764,11 @@ Plotly.restyle = function restyle(gd, astr, val, traces) {
// attr can be an array to set several at once (all to the same val)
function doextra(attr,val,i) {
if(Array.isArray(attr)) {
attr.forEach(function(a){ doextra(a,val,i); });
attr.forEach(function(a) { doextra(a,val,i); });
return;
}
// quit if explicitly setting this elsewhere
if(attr in aobj) { return; }
if(attr in aobj) return;

var extraparam;
if(attr.substr(0, 6) === 'LAYOUT') {
Expand Down Expand Up @@ -2055,7 +2055,7 @@ Plotly.restyle = function restyle(gd, astr, val, traces) {
// a complete layout redraw takes care of plot and
var seq;
if(dolayout) {
seq = [function changeLayout(){
seq = [function changeLayout() {
var copyLayout = gd.layout;
gd.layout = undefined;
return Plotly.plot(gd, '', copyLayout);
Expand All @@ -2068,7 +2068,7 @@ Plotly.restyle = function restyle(gd, astr, val, traces) {
plots.supplyDefaults(gd);
seq = [plots.previousPromises];
if(dostyle) {
seq.push(function doStyle(){
seq.push(function doStyle() {
// first see if we need to do arraysToCalcdata
// call it regardless of what change we made, in case
// supplyDefaults brought in an array that was already
Expand All @@ -2085,7 +2085,7 @@ Plotly.restyle = function restyle(gd, astr, val, traces) {
});
}
if(docolorbars) {
seq.push(function doColorBars(){
seq.push(function doColorBars() {
gd.calcdata.forEach(function(cd) {
if((cd[0].t || {}).cb) {
var trace = cd[0].trace,
Expand Down Expand Up @@ -2114,7 +2114,7 @@ Plotly.restyle = function restyle(gd, astr, val, traces) {

if(!plotDone || !plotDone.then) plotDone = Promise.resolve();

return plotDone.then(function(){
return plotDone.then(function() {
gd.emit('plotly_restyle',
Plotly.Lib.extendDeep([], [redoit, traces]));
});
Expand Down Expand Up @@ -2432,7 +2432,7 @@ Plotly.relayout = function relayout(gd, astr, val) {
seq = [plots.previousPromises];

if(doplot || docalc) {
seq.push(function layoutReplot(){
seq.push(function layoutReplot() {
// force plot() to redo the layout
gd.layout = undefined;
// force it to redo calcdata?
Expand All @@ -2447,7 +2447,7 @@ Plotly.relayout = function relayout(gd, astr, val) {
fullLayout = gd._fullLayout;

if(dolegend) {
seq.push(function doLegend(){
seq.push(function doLegend() {
Plotly.Legend.draw(gd);
return plots.previousPromises(gd);
});
Expand All @@ -2456,7 +2456,7 @@ Plotly.relayout = function relayout(gd, astr, val) {
if(dolayoutstyle) seq.push(layoutStyles);

if(doticks) {
seq.push(function(){
seq.push(function() {
Plotly.Axes.doTicks(gd,'redraw');
Plotly.Titles.draw(gd, 'gtitle');
return plots.previousPromises(gd);
Expand Down Expand Up @@ -2486,7 +2486,7 @@ Plotly.relayout = function relayout(gd, astr, val) {

if(!plotDone || !plotDone.then) plotDone = Promise.resolve();

return plotDone.then(function(){
return plotDone.then(function() {
gd.emit('plotly_relayout',
Plotly.Lib.extendDeep({}, redoit));
});
Expand Down Expand Up @@ -2671,7 +2671,7 @@ function makePlotFramework(gd) {
// position and style the containers, make main title
var frameWorkDone = Plotly.Lib.syncOrAsync([
layoutStyles,
function goAxes(){ return Plotly.Axes.doTicks(gd,'redraw'); },
function goAxes() { return Plotly.Axes.doTicks(gd,'redraw'); },
Plotly.Fx.init
], gd);

Expand Down
38 changes: 30 additions & 8 deletions src/plots/geo/geo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ module.exports = Geo;

var proto = Geo.prototype;

proto.plot = function(geoData, fullLayout) {
proto.plot = function(geoData, fullLayout, promises) {
var _this = this,
geoLayout = fullLayout[_this.id],
graphSize = fullLayout._size;
Expand Down Expand Up @@ -100,17 +100,39 @@ proto.plot = function(geoData, fullLayout) {
_this.topojsonName
);

// N.B this is async
d3.json(topojsonPath, function(error, topojson) {
_this.topojson = topojson;
PlotlyGeoAssets.topojson[_this.topojsonName] = topojson;
_this.onceTopojsonIsLoaded(geoData, geoLayout);
});
promises.push(new Promise(function(resolve, reject) {
d3.json(topojsonPath, function(error, topojson) {
if(error) {
if(error.status === 404) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reject()

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

New Promise(resolve, reject)

// in error handler
reject()

reject(new Error([
'plotly.js could not find topojson file at',
topojsonPath, '.',
'Make sure the *topojsonURL* plot config option',
'is set properly.'
].join(' ')));
}
else {
reject(new Error([
'unexpected error while fetching topojson file at',
topojsonPath
].join(' ')));
}
return;
}

_this.topojson = topojson;
PlotlyGeoAssets.topojson[_this.topojsonName] = topojson;

_this.onceTopojsonIsLoaded(geoData, geoLayout);
resolve();
});
}));
}
}
else _this.onceTopojsonIsLoaded(geoData, geoLayout);

// TODO handle topojson-is-loading case (for streaming)
// TODO handle topojson-is-loading case
// to avoid making multiple request while streaming
};

proto.onceTopojsonIsLoaded = function(geoData, geoLayout) {
Expand Down