playground
/
c3
mirror of https://github.com/masayuki0812/c3.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

Fix update for subchart

pull/1/head
Masayuki Tanaka 12 years ago committed by masayuki
parent
b829d1bcef
commit
d1ae9f8e7a
1 changed files with 14 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 27
      c3.js

27
c3.js
Unescape View File

@ -395,9 +395,9 @@
}) })
return indices return indices
} }
function getBarX (barWidth, barTargetsNum, barIndices) { function getBarX (scale, barWidth, barTargetsNum, barIndices) {
return function (d) { return function (d) {
return x(d.x) - barWidth * (barTargetsNum/2 - barIndices.indexOf(d.i)) return scale(d.x) - barWidth * (barTargetsNum/2 - barIndices.indexOf(d.i))
} }
} }
function getBarY (scale) { function getBarY (scale) {
@ -896,13 +896,13 @@
if (__legend_show) drawLegend(targets) if (__legend_show) drawLegend(targets)
// Update main chart with settings // Update main chart with settings
update(false, true) update(false, true, true)
// Draw chart for each data // Draw chart for each data
draw(targets) draw(targets)
} }
function update (withTransition, withY) { function update (withTransition, withY, withSubchart) {
var xgrid, xgridData, xgridLine var xgrid, xgridData, xgridLine
var mainPath, mainCircle, mainBar, contextPath var mainPath, mainCircle, mainBar, contextPath
var barTargetsNum = getTargetsNum(isBarType), barIndices = getBarTargetIndices() var barTargetsNum = getTargetsNum(isBarType), barIndices = getBarTargetIndices()
@ -910,6 +910,7 @@
var rectWidth var rectWidth
withY = (typeof withY === 'undefined') ? false : withY withY = (typeof withY === 'undefined') ? false : withY
withSubchart = (typeof withSubchart === 'undefined') ? false : withSubchart
x.domain(brush.empty() ? x2.domain() : brush.extent()) x.domain(brush.empty() ? x2.domain() : brush.extent())
@ -949,7 +950,7 @@
.attr("x", function(d){ return x(d.value) }) .attr("x", function(d){ return x(d.value) })
} }
// Y-Grid // Y-Grid
if (__grid_y_show && withY) { if (withY && __grid_y_show) {
ygrid = main.select('.ygrids').selectAll(".ygrid") ygrid = main.select('.ygrids').selectAll(".ygrid")
.data(y.ticks(10)) .data(y.ticks(10))
ygrid.enter().append('line') ygrid.enter().append('line')
@ -963,7 +964,7 @@
.attr("opacity", 1) .attr("opacity", 1)
ygrid.exit().remove() ygrid.exit().remove()
} }
if (__grid_y_lines && withY) { if (withY && __grid_y_lines) {
main.select('.ygrid-lines').selectAll('.ygrid-line') main.select('.ygrid-lines').selectAll('.ygrid-line')
.attr("y1", function(d){ return y(d.value) }) .attr("y1", function(d){ return y(d.value) })
.attr("y2", function(d){ return y(d.value) }) .attr("y2", function(d){ return y(d.value) })
@ -981,14 +982,14 @@
// bars // bars
barW = getBarW(xAxis, barTargetsNum) barW = getBarW(xAxis, barTargetsNum)
barH = getBarH(y, height) barH = getBarH(y, height)
barX = getBarX(barW, barTargetsNum, barIndices) barX = getBarX(x, barW, barTargetsNum, barIndices)
barY = getBarY(y) barY = getBarY(y)
mainBar = main.selectAll('.target').selectAll('.target-bar').filter(isBarType) mainBar = main.selectAll('.target').selectAll('.target-bar').filter(isBarType)
if (withTransition) mainBar = mainBar.transition() if (withTransition) mainBar = mainBar.transition()
mainBar.attr("x", barX).attr("y", barY).attr("width", barW).attr("height", barH) mainBar.attr("x", barX).attr("y", barY).attr("width", barW).attr("height", barH)
// subchart // subchart
if (__subchart_show) { if (withSubchart && __subchart_show) {
contextPath = context.selectAll('.target').selectAll('path').filter(isLineType) contextPath = context.selectAll('.target').selectAll('path').filter(isLineType)
if (withTransition) contextPath = contextPath.transition() if (withTransition) contextPath = contextPath.transition()
contextPath.attr("d", function(d){ return line2(d.values) }) contextPath.attr("d", function(d){ return line2(d.values) })
@ -996,7 +997,7 @@
// bars // bars
barW = getBarW(xAxis2, barTargetsNum) barW = getBarW(xAxis2, barTargetsNum)
barH = getBarH(y2, height2) barH = getBarH(y2, height2)
barX = getBarX(barW, barTargetsNum, barIndices) barX = getBarX(x2, barW, barTargetsNum, barIndices)
barY = getBarY(y2) barY = getBarY(y2)
contextBar = context.selectAll('.target').selectAll('.target-bar').filter(isBarType) contextBar = context.selectAll('.target').selectAll('.target-bar').filter(isBarType)
if (withTransition) contextBar = contextBar.transition() if (withTransition) contextBar = contextBar.transition()
@ -1059,7 +1060,7 @@
barIndices = getBarTargetIndices() barIndices = getBarTargetIndices()
barW = getBarW(xAxis, barTargetsNum) barW = getBarW(xAxis, barTargetsNum)
barH = getBarH(y, height) barH = getBarH(y, height)
barX = getBarX(barW, barTargetsNum, barIndices) barX = getBarX(x, barW, barTargetsNum, barIndices)
barY = getBarY(y) barY = getBarY(y)
f.append('g') f.append('g')
@ -1125,7 +1126,7 @@
// Rects for each data // Rects for each data
barW = getBarW(xAxis2, barTargetsNum) barW = getBarW(xAxis2, barTargetsNum)
barH = getBarH(y2, height2) barH = getBarH(y2, height2)
barX = getBarX(barW, barTargetsNum, barIndices) barX = getBarX(x2, barW, barTargetsNum, barIndices)
barY = getBarY(y2) barY = getBarY(y2)
c.append('g') c.append('g')
@ -1194,7 +1195,7 @@
main.select('.y.axis').transition().call(yAxis) main.select('.y.axis').transition().call(yAxis)
} }
update(true, true) update(true, true, true)
draw(c3.data.targets) draw(c3.data.targets)
@ -1368,7 +1369,7 @@
main.select('.y.axis').transition().call(yAxis) main.select('.y.axis').transition().call(yAxis)
} }
if (c3.data.targets.length > 0) update(true, true) if (c3.data.targets.length > 0) update(true, true, true)
} }
c3.selected = function (target) { c3.selected = function (target) {

Write Preview
Loading…
Cancel
Save