Skip to content
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

[v0.5] Horizontal Bar Chart: only accept a single Y Axis #40

Closed
wants to merge 1 commit into from
Closed

[v0.5] Horizontal Bar Chart: only accept a single Y Axis #40

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
10 changes: 9 additions & 1 deletion charts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,13 +434,21 @@ func Render(opt ChartOption, opts ...OptionFunc) (*Painter, error) {

// horizontal bar chart
if len(horizontalBarSeriesList) != 0 {
var yAxis YAxisOption
if len(opt.YAxis) > 0 {
if len(opt.YAxis) > 1 {
return nil, errors.New("horizontal bar chart only accepts a single Y-Axis")
}
yAxis = opt.YAxis[0]
}

handler.Add(func() error {
_, err := newHorizontalBarChart(p, HorizontalBarChartOption{
Theme: opt.Theme,
Font: opt.Font,
BarHeight: opt.BarHeight,
BarMargin: opt.BarMargin,
YAxis: opt.YAxis,
YAxis: yAxis,
StackSeries: opt.StackSeries,
}).render(renderResult, horizontalBarSeriesList)
return err
Expand Down
8 changes: 3 additions & 5 deletions examples/horizontal_bar_chart-2/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,9 @@ func main() {
opt.Legend.Data = []string{
"2011", "2012",
}
opt.YAxis = []charts.YAxisOption{
{
Data: []string{
"UN", "Brazil", "Indonesia", "USA", "India", "China", "World",
},
opt.YAxis = charts.YAxisOption{
Data: []string{
"UN", "Brazil", "Indonesia", "USA", "India", "China", "World",
},
}

Expand Down
8 changes: 3 additions & 5 deletions examples/horizontal_bar_chart-3/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,9 @@ func main() {
"2011", "2012",
}
opt.XAxis.Show = charts.False()
opt.YAxis = []charts.YAxisOption{
{
Data: []string{
"UN", "Brazil", "Indonesia", "USA", "India", "China", "World",
},
opt.YAxis = charts.YAxisOption{
Data: []string{
"UN", "Brazil", "Indonesia", "USA", "India", "China", "World",
},
}

Expand Down
8 changes: 3 additions & 5 deletions examples/multiple_charts-2/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,9 @@ func main() {
"2011", "2012",
},
},
YAxis: []charts.YAxisOption{
{
Data: []string{
"USA", "India", "China", "World",
},
YAxis: charts.YAxisOption{
Data: []string{
"USA", "India", "China", "World",
},
},
SeriesList: charts.NewSeriesListHorizontalBar([][]float64{
Expand Down
7 changes: 3 additions & 4 deletions horizontal_bar_chart.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ func NewHorizontalBarChartOptionWithData(data [][]float64) HorizontalBarChartOpt
Padding: defaultPadding,
Theme: GetDefaultTheme(),
Font: GetDefaultFont(),
YAxis: make([]YAxisOption, sl.getYAxisCount()),
ValueFormatter: defaultValueFormatter,
}
}
Expand All @@ -43,8 +42,8 @@ type HorizontalBarChartOption struct {
SeriesLabelPosition string
// XAxis are options for the x-axis.
XAxis XAxisOption
// YAxis are options for the y-axis (at most two).
YAxis []YAxisOption
// YAxis are options for the y-axis.
YAxis YAxisOption
// Title are options for rendering the title.
Title TitleOption
// Legend are options for the data legend.
Expand Down Expand Up @@ -193,7 +192,7 @@ func (h *horizontalBarChart) Render() (Box, error) {
seriesList: opt.SeriesList,
stackSeries: flagIs(true, opt.StackSeries),
xAxis: &h.opt.XAxis,
yAxis: opt.YAxis,
yAxis: []YAxisOption{opt.YAxis},
title: opt.Title,
legend: &h.opt.Legend,
valueFormatter: opt.ValueFormatter,
Expand Down
29 changes: 11 additions & 18 deletions horizontal_bar_chart_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,9 @@ func makeBasicHorizontalBarChartOption() HorizontalBarChartOption {
"2011", "2012",
},
},
YAxis: []YAxisOption{
{
Data: []string{
"Brazil", "Indonesia", "USA", "India", "China", "World",
},
YAxis: YAxisOption{
Data: []string{
"Brazil", "Indonesia", "USA", "India", "China", "World",
},
},
}
Expand All @@ -43,12 +41,10 @@ func makeMinimalHorizontalBarChartOption() HorizontalBarChartOption {
{12, 24},
{24, 48},
})
opt.YAxis = []YAxisOption{
{
Show: False(),
Data: []string{
"A", "B",
},
opt.YAxis = YAxisOption{
Show: False(),
Data: []string{
"A", "B",
},
}
opt.XAxis.Show = False()
Expand Down Expand Up @@ -81,11 +77,9 @@ func makeFullHorizontalBarChartStackedOption() HorizontalBarChartOption {
Legend: LegendOption{
Data: dataLabels,
},
YAxis: []YAxisOption{
{
Data: []string{
"1", "2", "3", "4", "5", "6", "7", "8",
},
YAxis: YAxisOption{
Data: []string{
"1", "2", "3", "4", "5", "6", "7", "8",
},
},
}
Expand All @@ -101,7 +95,6 @@ func TestNewHorizontalBarChartOptionWithData(t *testing.T) {

assert.Len(t, opt.SeriesList, 2)
assert.Equal(t, ChartTypeHorizontalBar, opt.SeriesList[0].Type)
assert.Len(t, opt.YAxis, 1)
assert.Equal(t, defaultPadding, opt.Padding)

p := NewPainter(PainterOptions{})
Expand Down Expand Up @@ -181,7 +174,7 @@ func TestHorizontalBarChart(t *testing.T) {
opt := makeBasicHorizontalBarChartOption()
opt.Title.Show = False()
opt.XAxis.Show = False()
opt.YAxis[0].Show = False()
opt.YAxis.Show = False()
opt.Legend.Show = False()
opt.BarHeight = 1000
return opt
Expand Down
Loading