Skip to content

Commit f5ed2f8

Browse files
committed
fixed Prefix in json getting ignored
1 parent 1b28c8e commit f5ed2f8

File tree

11 files changed

+44
-22
lines changed

11 files changed

+44
-22
lines changed

examples/10print/main.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,16 @@ func main() {
116116
var prefix string
117117
var randomSeed int64
118118
flag.StringVar(&configFile, "c", "sketch.json", "Sketch config file")
119-
flag.StringVar(&prefix, "p", "sketch", "Output file prefix")
119+
flag.StringVar(&prefix, "p", "", "Output file prefix")
120120
flag.Int64Var(&randomSeed, "s", 0, "Random number generator seed")
121121
flag.Parse()
122122
s, err := sketchy.NewSketchFromFile(configFile)
123123
if err != nil {
124124
log.Fatal(err)
125125
}
126-
s.Prefix = prefix
126+
if prefix != "" {
127+
s.Prefix = prefix
128+
}
127129
s.RandomSeed = randomSeed
128130
s.Updater = update
129131
s.Drawer = draw

examples/fractal/main.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,16 @@ func main() {
5454
var prefix string
5555
var randomSeed int64
5656
flag.StringVar(&configFile, "c", "sketch.json", "Sketch config file")
57-
flag.StringVar(&prefix, "p", "sketch", "Output file prefix")
57+
flag.StringVar(&prefix, "p", "", "Output file prefix")
5858
flag.Int64Var(&randomSeed, "s", 0, "Random number generator seed")
5959
flag.Parse()
6060
s, err := sketchy.NewSketchFromFile(configFile)
6161
if err != nil {
6262
log.Fatal(err)
6363
}
64-
s.Prefix = prefix
64+
if prefix != "" {
65+
s.Prefix = prefix
66+
}
6567
s.RandomSeed = randomSeed
6668
s.Updater = update
6769
s.Drawer = draw

examples/lissajous/main.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,16 @@ func main() {
3838
var prefix string
3939
var randomSeed int64
4040
flag.StringVar(&configFile, "c", "sketch.json", "Sketch config file")
41-
flag.StringVar(&prefix, "p", "sketch", "Output file prefix")
41+
flag.StringVar(&prefix, "p", "", "Output file prefix")
4242
flag.Int64Var(&randomSeed, "s", 0, "Random number generator seed")
4343
flag.Parse()
4444
s, err := sketchy.NewSketchFromFile(configFile)
4545
if err != nil {
4646
log.Fatal(err)
4747
}
48-
s.Prefix = prefix
48+
if prefix != "" {
49+
s.Prefix = prefix
50+
}
4951
s.RandomSeed = randomSeed
5052
s.Updater = update
5153
s.Drawer = draw

examples/noise/main.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,16 @@ func main() {
5959
var prefix string
6060
var randomSeed int64
6161
flag.StringVar(&configFile, "c", "sketch.json", "Sketch config file")
62-
flag.StringVar(&prefix, "p", "sketch", "Output file prefix")
62+
flag.StringVar(&prefix, "p", "", "Output file prefix")
6363
flag.Int64Var(&randomSeed, "s", 0, "Random number generator seed")
6464
flag.Parse()
6565
s, err := sketchy.NewSketchFromFile(configFile)
6666
if err != nil {
6767
log.Fatal(err)
6868
}
69-
s.Prefix = prefix
69+
if prefix != "" {
70+
s.Prefix = prefix
71+
}
7072
s.RandomSeed = randomSeed
7173
s.Updater = update
7274
s.Drawer = draw

examples/scale_rotate/main.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,16 @@ func main() {
4949
var prefix string
5050
var randomSeed int64
5151
flag.StringVar(&configFile, "c", "sketch.json", "Sketch config file")
52-
flag.StringVar(&prefix, "p", "sketch", "Output file prefix")
52+
flag.StringVar(&prefix, "p", "", "Output file prefix")
5353
flag.Int64Var(&randomSeed, "s", 0, "Random number generator seed")
5454
flag.Parse()
5555
s, err := sketchy.NewSketchFromFile(configFile)
5656
if err != nil {
5757
log.Fatal(err)
5858
}
59-
s.Prefix = prefix
59+
if prefix != "" {
60+
s.Prefix = prefix
61+
}
6062
s.RandomSeed = randomSeed
6163
s.Updater = update
6264
s.Drawer = draw

examples/simple/main.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,16 @@ func main() {
2727
var prefix string
2828
var randomSeed int64
2929
flag.StringVar(&configFile, "c", "sketch.json", "Sketch config file")
30-
flag.StringVar(&prefix, "p", "sketch", "Output file prefix")
30+
flag.StringVar(&prefix, "p", "", "Output file prefix")
3131
flag.Int64Var(&randomSeed, "s", 0, "Random number generator seed")
3232
flag.Parse()
3333
s, err := sketchy.NewSketchFromFile(configFile)
3434
if err != nil {
3535
log.Fatal(err)
3636
}
37-
s.Prefix = prefix
37+
if prefix != "" {
38+
s.Prefix = prefix
39+
}
3840
s.RandomSeed = randomSeed
3941
s.Updater = update
4042
s.Drawer = draw

template/main.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,16 @@ func main() {
2222
var prefix string
2323
var randomSeed int64
2424
flag.StringVar(&configFile, "c", "sketch.json", "Sketch config file")
25-
flag.StringVar(&prefix, "p", "sketch", "Output file prefix")
25+
flag.StringVar(&prefix, "p", "", "Output file prefix")
2626
flag.Int64Var(&randomSeed, "s", 0, "Random number generator seed")
2727
flag.Parse()
2828
s, err := sketchy.NewSketchFromFile(configFile)
2929
if err != nil {
3030
log.Fatal(err)
3131
}
32-
s.Prefix = prefix
32+
if prefix != "" {
33+
s.Prefix = prefix
34+
}
3335
s.RandomSeed = randomSeed
3436
s.Updater = update
3537
s.Drawer = draw

visual_tests/color_gradient/color_gradient.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,16 @@ func main() {
5353
var prefix string
5454
var randomSeed int64
5555
flag.StringVar(&configFile, "c", "sketch.json", "Sketch config file")
56-
flag.StringVar(&prefix, "p", "sketch", "Output file prefix")
56+
flag.StringVar(&prefix, "p", "", "Output file prefix")
5757
flag.Int64Var(&randomSeed, "s", 0, "Random number generator seed")
5858
flag.Parse()
5959
s, err := sketchy.NewSketchFromFile(configFile)
6060
if err != nil {
6161
log.Fatal(err)
6262
}
63-
s.Prefix = prefix
63+
if prefix != "" {
64+
s.Prefix = prefix
65+
}
6466
s.RandomSeed = randomSeed
6567
s.Updater = update
6668
s.Drawer = draw

visual_tests/curve_lerp/curve_lerp.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,16 @@ func main() {
5656
var prefix string
5757
var randomSeed int64
5858
flag.StringVar(&configFile, "c", "sketch.json", "Sketch config file")
59-
flag.StringVar(&prefix, "p", "sketch", "Output file prefix")
59+
flag.StringVar(&prefix, "p", "", "Output file prefix")
6060
flag.Int64Var(&randomSeed, "s", 0, "Random number generator seed")
6161
flag.Parse()
6262
s, err := sketchy.NewSketchFromFile(configFile)
6363
if err != nil {
6464
log.Fatal(err)
6565
}
66-
s.Prefix = prefix
66+
if prefix != "" {
67+
s.Prefix = prefix
68+
}
6769
s.RandomSeed = randomSeed
6870
s.Updater = update
6971
s.Drawer = draw

visual_tests/perpendicular/perpendicular.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,16 @@ func main() {
4444
var prefix string
4545
var randomSeed int64
4646
flag.StringVar(&configFile, "c", "sketch.json", "Sketch config file")
47-
flag.StringVar(&prefix, "p", "sketch", "Output file prefix")
47+
flag.StringVar(&prefix, "p", "", "Output file prefix")
4848
flag.Int64Var(&randomSeed, "s", 0, "Random number generator seed")
4949
flag.Parse()
5050
s, err := sketchy.NewSketchFromFile(configFile)
5151
if err != nil {
5252
log.Fatal(err)
5353
}
54-
s.Prefix = prefix
54+
if prefix != "" {
55+
s.Prefix = prefix
56+
}
5557
s.RandomSeed = randomSeed
5658
s.Updater = update
5759
s.Drawer = draw

0 commit comments

Comments
 (0)