Skip to content

Commit e331c55

Browse files
committed
all: introduce no-err New plot function
1 parent 5093fd0 commit e331c55

57 files changed

Lines changed: 114 additions & 401 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

align_example_test.go

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,7 @@ func ExampleAlign() {
2626
continue
2727
}
2828

29-
p, err := plot.New()
30-
if err != nil {
31-
panic(err)
32-
}
29+
p := plot.New()
3330

3431
if j == 0 && i == 2 {
3532
// This shows what happens when the axis padding
@@ -93,11 +90,7 @@ func ExampleAlign() {
9390
}
9491

9592
func ExampleAxis_labelsPosition() {
96-
p, err := plot.New()
97-
if err != nil {
98-
log.Fatalf("could not create plot: %+v", err)
99-
}
100-
93+
p := plot.New()
10194
p.Title.Text = "Title"
10295
p.X.Label.Text = "X [mm]"
10396
p.Y.Label.Text = "Y [A.U.]"
@@ -108,7 +101,7 @@ func ExampleAxis_labelsPosition() {
108101
p.Y.Min = -10
109102
p.Y.Max = +10
110103

111-
err = p.Save(10*vg.Centimeter, 10*vg.Centimeter, "testdata/axis_labels.png")
104+
err := p.Save(10*vg.Centimeter, 10*vg.Centimeter, "testdata/axis_labels.png")
112105
if err != nil {
113106
log.Fatalf("could not save plot: %+v", err)
114107
}

axis_test.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -156,19 +156,15 @@ func TestAxisPadding(t *testing.T) {
156156
for _, padding := range []int{0, 5, 10} {
157157
t.Run(fmt.Sprintf("padding-%d", padding), func(t *testing.T) {
158158
cmpimg.CheckPlot(func() {
159-
p, err := New()
160-
if err != nil {
161-
t.Fatalf("error: %+v", err)
162-
}
163-
159+
p := New()
164160
p.Title.Text = fmt.Sprintf("padding=%d", padding)
165161
p.X.Label.Text = "X-Axis"
166162
p.X.Label.Padding = vg.Points(float64(padding))
167163
p.Y.Label.Text = "Y-Axis"
168164
p.Y.Label.Padding = vg.Points(float64(padding))
169165

170166
const size = 5 * vg.Centimeter
171-
err = p.Save(size, size, fmt.Sprintf("testdata/axis_padding_%02d.png", padding))
167+
err := p.Save(size, size, fmt.Sprintf("testdata/axis_padding_%02d.png", padding))
172168
if err != nil {
173169
t.Fatalf("error: %+v", err)
174170
}

gob/gob_test.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,7 @@ func TestPersistency(t *testing.T) {
3333
lineData := randomPoints(n, rnd)
3434
linePointsData := randomPoints(n, rnd)
3535

36-
p, err := plot.New()
37-
if err != nil {
38-
t.Fatalf("error creating plot: %v\n", err)
39-
}
40-
36+
p := plot.New()
4137
p.Title.Text = "Plot Example"
4238
p.X.Label.Text = "X"
4339
p.Y.Label.Text = "Y"

palette/moreland/example_test.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,7 @@ func Example() {
119119

120120
h := plotter.NewHeatMap(m, plte.cmap)
121121

122-
p, err := plot.New()
123-
if err != nil {
124-
log.Panic(err)
125-
}
122+
p := plot.New()
126123
p.Title.Text = plte.name
127124

128125
p.Add(h)

palette/reverse_example_test.go

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@ import (
1717
// This example creates a color bar and a second color bar where the
1818
// direction of the colors are reversed.
1919
func ExampleReverse() {
20-
p, err := plot.New()
21-
if err != nil {
22-
log.Panic(err)
23-
}
20+
p := plot.New()
2421
l := &plotter.ColorBar{ColorMap: moreland.Kindlmann()}
2522
l2 := &plotter.ColorBar{ColorMap: palette.Reverse(moreland.Kindlmann())}
2623
l.ColorMap.SetMin(0.5)
@@ -33,17 +30,14 @@ func ExampleReverse() {
3330
p.X.Padding = 0
3431
p.Title.Text = "A ColorMap and its Reverse"
3532

36-
if err = p.Save(300, 48, "testdata/reverse.png"); err != nil {
33+
if err := p.Save(300, 48, "testdata/reverse.png"); err != nil {
3734
log.Panic(err)
3835
}
3936
}
4037

4138
// This example creates a color palette from a reversed ColorMap.
4239
func ExampleReverse_palette() {
43-
p, err := plot.New()
44-
if err != nil {
45-
log.Panic(err)
46-
}
40+
p := plot.New()
4741
thumbs := plotter.PaletteThumbnailers(palette.Reverse(moreland.Kindlmann()).Palette(10))
4842
for i, t := range thumbs {
4943
p.Legend.Add(fmt.Sprint(i), t)
@@ -52,7 +46,7 @@ func ExampleReverse_palette() {
5246
p.X.Padding = 0
5347
p.Y.Padding = 0
5448

55-
if err = p.Save(35, 120, "testdata/reverse_palette.png"); err != nil {
49+
if err := p.Save(35, 120, "testdata/reverse_palette.png"); err != nil {
5650
log.Panic(err)
5751
}
5852
}

plot.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,8 @@ const (
9292
vertical
9393
)
9494

95-
// New returns a new plot with some reasonable
96-
// default settings.
97-
func New() (*Plot, error) {
95+
// New returns a new plot with some reasonable default settings.
96+
func New() *Plot {
9897
hdlr := DefaultTextHandler
9998
p := &Plot{
10099
BackgroundColor: color.White,
@@ -110,7 +109,7 @@ func New() (*Plot, error) {
110109
YAlign: draw.YTop,
111110
Handler: hdlr,
112111
}
113-
return p, nil
112+
return p
114113
}
115114

116115
// Add adds a Plotters to the plot.

plot_test.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,7 @@ func TestIssue514(t *testing.T) {
8888
go func() {
8989
defer close(done)
9090

91-
p, err := plot.New()
92-
if err != nil {
93-
t.Errorf("could not create plot: %v", err)
94-
return
95-
}
91+
p := plot.New()
9692

9793
var (
9894
y1 = 100.0

plotter/barchart_example_test.go

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,7 @@ func ExampleBarChart() {
2222
horizontalLabels := []string{"Label A", "Label B", "Label C", "Label D"}
2323

2424
// Create a vertical BarChart
25-
p1, err := plot.New()
26-
if err != nil {
27-
log.Panic(err)
28-
}
25+
p1 := plot.New()
2926
verticalBarChart, err := plotter.NewBarChart(values, 0.5*vg.Centimeter)
3027
if err != nil {
3128
log.Panic(err)
@@ -38,10 +35,7 @@ func ExampleBarChart() {
3835
}
3936

4037
// Create a horizontal BarChart
41-
p2, err := plot.New()
42-
if err != nil {
43-
log.Panic(err)
44-
}
38+
p2 := plot.New()
4539
horizontalBarChart, err := plotter.NewBarChart(values, 0.5*vg.Centimeter)
4640
horizontalBarChart.Horizontal = true // Specify a horizontal BarChart.
4741
if err != nil {
@@ -60,10 +54,7 @@ func ExampleBarChart() {
6054
groupC := plotter.Values{12, 28, 15, 21, 8}
6155
groupD := plotter.Values{30, 42, 6, 9, 12}
6256

63-
p, err := plot.New()
64-
if err != nil {
65-
log.Panic(err)
66-
}
57+
p := plot.New()
6758
p.Title.Text = "Bar chart"
6859
p.Y.Label.Text = "Heights"
6960

@@ -115,10 +106,7 @@ func ExampleBarChart() {
115106
}
116107

117108
// Now, make a stacked BarChart.
118-
p, err = plot.New()
119-
if err != nil {
120-
log.Panic(err)
121-
}
109+
p = plot.New()
122110
p.Title.Text = "Bar chart"
123111
p.Y.Label.Text = "Heights"
124112

@@ -243,10 +231,7 @@ func ExampleBarChart_positiveNegative() {
243231
log.Panic(err)
244232
}
245233

246-
p, err := plot.New()
247-
if err != nil {
248-
log.Panic(err)
249-
}
234+
p := plot.New()
250235
p.Add(zero, pos1, pos2, neg1, neg2, netDots)
251236
p.NominalY("Alpha", "Bravo", "Charlie", "Echo", "Foxtrot", "Golf")
252237

plotter/boxplot_example_test.go

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,7 @@ func ExampleBoxPlot() {
6060
log.Panic(err)
6161
}
6262

63-
p1, err := plot.New()
64-
if err != nil {
65-
log.Panic(err)
66-
}
63+
p1 := plot.New()
6764
p1.Title.Text = "Vertical Box Plot"
6865
p1.Y.Label.Text = "plotter.Values"
6966
p1.Y.Max = 6
@@ -97,10 +94,7 @@ func ExampleBoxPlot() {
9794
log.Panic(err)
9895
}
9996

100-
p2, err := plot.New()
101-
if err != nil {
102-
log.Panic(err)
103-
}
97+
p2 := plot.New()
10498
p2.Title.Text = "Horizontal Box Plot"
10599
p2.X.Label.Text = "plotter.Values"
106100

@@ -117,10 +111,7 @@ func ExampleBoxPlot() {
117111
}
118112

119113
// Now, make a grouped box plot.
120-
p3, err := plot.New()
121-
if err != nil {
122-
log.Panic(err)
123-
}
114+
p3 := plot.New()
124115
p3.Title.Text = "Box Plot"
125116
p3.Y.Label.Text = "plotter.Values"
126117

plotter/bubbles_example_test.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,7 @@ func ExampleScatter_bubbles() {
5252
}
5353
}
5454

55-
p, err := plot.New()
56-
if err != nil {
57-
log.Panic(err)
58-
}
55+
p := plot.New()
5956
p.Title.Text = "Bubbles"
6057
p.X.Label.Text = "X"
6158
p.Y.Label.Text = "Y"

0 commit comments

Comments
 (0)