Skip to content

Add stacked type for static bar chart. #170

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add stacked type for static bar chart. #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
110 changes: 81 additions & 29 deletions src/basic/bar.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,21 @@ class Epoch.Chart.Bar extends Epoch.Chart.Plot
_isHorizontal: ->
@options.orientation == 'horizontal'

# @return [Boolean] True if the chart style is stacked, false otherwise
_isStacked: ->
@options.style == 'stacked'

# @return [Function] The scale used to generate the chart's x scale.
x: ->
if @_isVertical()
d3.scale.ordinal()
.domain(Epoch.Util.domain(@getVisibleLayers()))
.rangeRoundBands([0, @innerWidth()], @options.padding.group, @options.outerPadding.group)
else
extent = @extent((d) -> d.y)
if @_isStacked()
extent = @extent((d) -> d.y + d.y0)
else
extent = @extent((d) -> d.y)
extent[0] = Math.min(0, extent[0])
d3.scale.linear()
.domain(extent)
Expand All @@ -67,7 +74,10 @@ class Epoch.Chart.Bar extends Epoch.Chart.Plot
# @return [Function] The y scale used to render the bar chart.
y: ->
if @_isVertical()
extent = @extent((d) -> d.y)
if @_isStacked()
extent = @extent((d) -> d.y + d.y0)
else
extent = @extent((d) -> d.y)
extent[0] = Math.min(0, extent[0])
d3.scale.linear()
.domain(extent)
Expand All @@ -83,6 +93,20 @@ class Epoch.Chart.Bar extends Epoch.Chart.Plot
.domain((layer.category for layer in @getVisibleLayers()))
.rangeRoundBands([0, y0.rangeBand()], @options.padding.bar, @options.outerPadding.bar)

# Performs post formatted data preparation.
# Override to add stacking (y0) if needed.
# @param data Data to prepare before setting.
# @return The prepared data.
_prepareData: (data) ->
if @_isStacked()
stack = d3.layout.stack()
.values( (d) -> d.values )
.out( (d, y0, y) ->

)
stack data
data

# Remaps the bar chart data into a form that is easier to display.
# @return [Array] The reorganized data.
_remapData: ->
Expand All @@ -91,7 +115,7 @@ class Epoch.Chart.Bar extends Epoch.Chart.Plot
className = 'bar ' + layer.className.replace(/\s*layer\s*/, '')
for entry in layer.values
map[entry.x] ?= []
map[entry.x].push { label: layer.category, y: entry.y, className: className }
map[entry.x].push Epoch.Util.defaults(entry, { label: layer.category, className: className })
({group: k, values: v} for own k, v of map)

# Draws the bar char.
Expand All @@ -104,7 +128,7 @@ class Epoch.Chart.Bar extends Epoch.Chart.Plot

# Draws the bar chart with a vertical orientation
_drawVertical: ->
[x0, y] = [@x(), @y()]
[x0, y, isStacked] = [@x(), @y(), @_isStacked()]
x1 = @x1(x0)
height = @height - @margins.top - @margins.bottom
data = @_remapData()
Expand All @@ -127,18 +151,32 @@ class Epoch.Chart.Bar extends Epoch.Chart.Plot

rects.attr('class', (d) -> d.className)

rects.transition().duration(600)
.attr('x', (d) -> x1(d.label))
.attr('y', (d) -> y(d.y))
.attr('width', x1.rangeBand())
.attr('height', (d) -> height - y(d.y))

rects.enter().append('rect')
.attr('class', (d) -> d.className)
.attr('x', (d) -> x1(d.label))
.attr('y', (d) -> y(d.y))
.attr('width', x1.rangeBand())
.attr('height', (d) -> height - y(d.y))
if isStacked
rects.transition().duration(600)
.attr('x', (d) -> x0(d.category))
.attr('y', (d) -> y(d.y + d.y0))
.attr('width', x0.rangeBand())
.attr('height', (d) -> height - y(d.y))

rects.enter().append('rect')
.attr('class', (d) -> d.className)
.attr('x', (d) -> x0(d.category))
.attr('y', (d) -> y(d.y + d.y0))
.attr('width', x0.rangeBand())
.attr('height', (d) -> height - y(d.y))
else
rects.transition().duration(600)
.attr('x', (d) -> x1(d.label))
.attr('y', (d) -> y(d.y))
.attr('width', x1.rangeBand())
.attr('height', (d) -> height - y(d.y))

rects.enter().append('rect')
.attr('class', (d) -> d.className)
.attr('x', (d) -> x1(d.label))
.attr('y', (d) -> y(d.y))
.attr('width', x1.rangeBand())
.attr('height', (d) -> height - y(d.y))

rects.exit().transition()
.duration(150)
Expand All @@ -156,7 +194,7 @@ class Epoch.Chart.Bar extends Epoch.Chart.Plot

# Draws the bar chart with a horizontal orientation
_drawHorizontal: ->
[x, y0] = [@x(), @y()]
[x, y0, isStacked] = [@x(), @y(),@_isStacked()]
y1 = @y1(y0)
width = @width - @margins.left - @margins.right
data = @_remapData()
Expand All @@ -179,18 +217,32 @@ class Epoch.Chart.Bar extends Epoch.Chart.Plot

rects.attr('class', (d) -> d.className)

rects.transition().duration(600)
.attr('x', (d) -> 0)
.attr('y', (d) -> y1(d.label))
.attr('height', y1.rangeBand())
.attr('width', (d) -> x(d.y))

rects.enter().append('rect')
.attr('class', (d) -> d.className)
.attr('x', (d) -> 0)
.attr('y', (d) -> y1(d.label))
.attr('height', y1.rangeBand())
.attr('width', (d) -> x(d.y))
if isStacked
rects.transition().duration(600)
.attr('x', (d) -> x(d.y0))
.attr('y', (d) -> y0(d.category))
.attr('height', y0.rangeBand())
.attr('width', (d) -> x(d.y))

rects.enter().append('rect')
.attr('class', (d) -> d.className)
.attr('x', (d) -> x(d.y0))
.attr('y', (d) -> y0(d.category))
.attr('height', y0.rangeBand())
.attr('width', (d) -> x(d.y))
else
rects.transition().duration(600)
.attr('x', (d) -> 0)
.attr('y', (d) -> y1(d.label))
.attr('height', y1.rangeBand())
.attr('width', (d) -> x(d.y))

rects.enter().append('rect')
.attr('class', (d) -> d.className)
.attr('x', (d) -> 0)
.attr('y', (d) -> y1(d.label))
.attr('height', y1.rangeBand())
.attr('width', (d) -> x(d.y))

rects.exit().transition()
.duration(150)
Expand Down
Loading