vitalif-js
/
dimple
mirror of https://github.com/vitalif/dimple
1
0
Fork 0
Code Issues Releases Wiki Activity

Added Bar Fixes

master
johnkiernander 2014-04-07 23:30:40 +01:00
parent c05839e1aa
commit 8ae6cc64c5
4 changed files with 100 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
dist/dimple.v1.2.0.js vendored
View File

@ -2905,7 +2905,7 @@ var dimple = {
h = (this.getBBox().width > h ? this.getBBox().height : h);
});
// Position the text relatve to the bubble, the absolute positioning
// Position the text relative to the bubble, the absolute positioning
// will be done by translating the group
t.selectAll("text")
.attr("x", 0)
@ -2969,7 +2969,18 @@ var dimple = {
chartData = series._positionData,
// If the series is uninitialised create placeholders, otherwise use the existing shapes
theseShapes = null,
className = "series" + chart.series.indexOf(series);
className = "series" + chart.series.indexOf(series),
addTransition = function (input, duration) {
var returnShape = null;
if (duration === 0) {
returnShape = input;
} else {
returnShape = input.transition().duration(duration);
}
return returnShape;
},
updated,
removed;
if (chart._tooltipGroup !== null && chart._tooltipGroup !== undefined) {
chart._tooltipGroup.remove();
@ -3011,8 +3022,7 @@ var dimple = {
});
// Update
theseShapes
.transition().duration(duration)
updated = addTransition(theseShapes, duration)
.attr("x", function (d) { return dimple._helpers.x(d, chart, series); })
.attr("y", function (d) { return dimple._helpers.y(d, chart, series); })
.attr("width", function (d) { return dimple._helpers.width(d, chart, series); })
@ -3025,16 +3035,30 @@ var dimple = {
});
// Remove
theseShapes
.exit()
.transition().duration(duration)
removed = addTransition(theseShapes.exit(), duration)
.attr("x", function (d) { return dimple._helpers.x(d, chart, series); })
.attr("y", function (d) { return dimple._helpers.y(d, chart, series); })
.attr("width", function (d) { return dimple._helpers.width(d, chart, series); })
.attr("height", function (d) { return dimple._helpers.height(d, chart, series); })
.each("end", function () {
.attr("height", function (d) { return dimple._helpers.height(d, chart, series); });
// Run after transition methods
if (duration === 0) {
updated.each(function (d, i) {
if (series.afterDraw !== null && series.afterDraw !== undefined) {
series.afterDraw(this, d, i);
}
});
removed.remove();
} else {
updated.each("end", function (d, i) {
if (series.afterDraw !== null && series.afterDraw !== undefined) {
series.afterDraw(this, d, i);
}
});
removed.each("end", function () {
d3.select(this).remove();
});
}
// Save the shapes to the series array
series.shapes = theseShapes;

4
dist/dimple.v1.2.0.min.js vendored
View File

File diff suppressed because one or more lines are too long

40
src/objects/plot/bar.js
View File

@ -18,7 +18,18 @@
chartData = series._positionData,
// If the series is uninitialised create placeholders, otherwise use the existing shapes
theseShapes = null,
className = "series" + chart.series.indexOf(series);
className = "series" + chart.series.indexOf(series),
addTransition = function (input, duration) {
var returnShape = null;
if (duration === 0) {
returnShape = input;
} else {
returnShape = input.transition().duration(duration);
}
return returnShape;
},
updated,
removed;
if (chart._tooltipGroup !== null && chart._tooltipGroup !== undefined) {
chart._tooltipGroup.remove();
@ -60,8 +71,7 @@
});
// Update
theseShapes
.transition().duration(duration)
updated = addTransition(theseShapes, duration)
.attr("x", function (d) { return dimple._helpers.x(d, chart, series); })
.attr("y", function (d) { return dimple._helpers.y(d, chart, series); })
.attr("width", function (d) { return dimple._helpers.width(d, chart, series); })
@ -74,16 +84,30 @@
});
// Remove
theseShapes
.exit()
.transition().duration(duration)
removed = addTransition(theseShapes.exit(), duration)
.attr("x", function (d) { return dimple._helpers.x(d, chart, series); })
.attr("y", function (d) { return dimple._helpers.y(d, chart, series); })
.attr("width", function (d) { return dimple._helpers.width(d, chart, series); })
.attr("height", function (d) { return dimple._helpers.height(d, chart, series); })
.each("end", function () {
.attr("height", function (d) { return dimple._helpers.height(d, chart, series); });
// Run after transition methods
if (duration === 0) {
updated.each(function (d, i) {
if (series.afterDraw !== null && series.afterDraw !== undefined) {
series.afterDraw(this, d, i);
}
});
removed.remove();
} else {
updated.each("end", function (d, i) {
if (series.afterDraw !== null && series.afterDraw !== undefined) {
series.afterDraw(this, d, i);
}
});
removed.each("end", function () {
d3.select(this).remove();
});
}
// Save the shapes to the series array
series.shapes = theseShapes;

42
tmp/dimple.js
View File

@ -2905,7 +2905,7 @@ var dimple = {
h = (this.getBBox().width > h ? this.getBBox().height : h);
});
// Position the text relatve to the bubble, the absolute positioning
// Position the text relative to the bubble, the absolute positioning
// will be done by translating the group
t.selectAll("text")
.attr("x", 0)
@ -2969,7 +2969,18 @@ var dimple = {
chartData = series._positionData,
// If the series is uninitialised create placeholders, otherwise use the existing shapes
theseShapes = null,
className = "series" + chart.series.indexOf(series);
className = "series" + chart.series.indexOf(series),
addTransition = function (input, duration) {
var returnShape = null;
if (duration === 0) {
returnShape = input;
} else {
returnShape = input.transition().duration(duration);
}
return returnShape;
},
updated,
removed;
if (chart._tooltipGroup !== null && chart._tooltipGroup !== undefined) {
chart._tooltipGroup.remove();
@ -3011,8 +3022,7 @@ var dimple = {
});
// Update
theseShapes
.transition().duration(duration)
updated = addTransition(theseShapes, duration)
.attr("x", function (d) { return dimple._helpers.x(d, chart, series); })
.attr("y", function (d) { return dimple._helpers.y(d, chart, series); })
.attr("width", function (d) { return dimple._helpers.width(d, chart, series); })
@ -3025,16 +3035,30 @@ var dimple = {
});
// Remove
theseShapes
.exit()
.transition().duration(duration)
removed = addTransition(theseShapes.exit(), duration)
.attr("x", function (d) { return dimple._helpers.x(d, chart, series); })
.attr("y", function (d) { return dimple._helpers.y(d, chart, series); })
.attr("width", function (d) { return dimple._helpers.width(d, chart, series); })
.attr("height", function (d) { return dimple._helpers.height(d, chart, series); })
.each("end", function () {
.attr("height", function (d) { return dimple._helpers.height(d, chart, series); });
// Run after transition methods
if (duration === 0) {
updated.each(function (d, i) {
if (series.afterDraw !== null && series.afterDraw !== undefined) {
series.afterDraw(this, d, i);
}
});
removed.remove();
} else {
updated.each("end", function (d, i) {
if (series.afterDraw !== null && series.afterDraw !== undefined) {
series.afterDraw(this, d, i);
}
});
removed.each("end", function () {
d3.select(this).remove();
});
}
// Save the shapes to the series array
series.shapes = theseShapes;