Skip to content

Commit

Permalink
Add tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@tdewolff
tdewolff committed Sep 21, 2019
1 parent 4110412 commit 42cfee9
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 9 deletions.
4 changes: 2 additions & 2 deletions path_stroke.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -460,9 +460,9 @@ func offsetSegment(p *Path, halfWidth float64, cr Capper, jr Joiner) (*Path, *Pa
return rhs, nil
}

// Offset offsets the path to expand by w and returns a new path. If w is negative it will contract.
// Offset offsets the path to expand by w and returns a new path. If w is negative it will contract. Path must be closed.
func (p *Path) Offset(w float64) *Path {
if w == 0.0 {
if equal(w, 0.0) {
return p
}

Expand Down
40 changes: 33 additions & 7 deletions path_stroke_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
)

func TestPathStroke(t *testing.T) {
// TODO: remove last lineTo if followed by close to the same location (butt and square cappers), fix in path.Close() func?
Tolerance = 1.0
Epsilon = 1e-3
// TODO: remove last lineTo if followed by close to the same location (butt and square cappers), fix in path.Close() func?
var tts = []struct {
orig string
w float64
Expand Down Expand Up @@ -47,21 +47,27 @@ func TestPathStroke(t *testing.T) {
{"M0 0L0 10L10 10L10 0z", 2.0, ButtCapper, BevelJoiner, "M-1 0L-1 10L0 11L10 11L11 10L11 0L10 -1L0 -1L-1 0zM1 0L0 1L10 1L9 0L9 10L10 9L0 9L1 10z"},
{"M0 0Q10 0 10 10", 2.0, ButtCapper, BevelJoiner, "M0 -1L9.6467 3.7346L11 10L9 10L7.6849 4.3366L0 1L0 -1z"},
{"M0 0C0 10 10 10 10 0", 2.0, ButtCapper, BevelJoiner, "M1 0L3.4056 6.0146L6.9801 5.7289L9 0L11 0L9.7996 5.3497L2.7451 7.9408L-1 0L1 0z"},
//{"M0 0A10 5 0 0 0 20 0", 2.0, ButtCapper, BevelJoiner, "M1 0A9 4 0 0 0 19 0L21 0A11 6 0 0 1 -1 0L1 0z"},
//{"M0 0A10 5 0 0 1 20 0", 2.0, ButtCapper, BevelJoiner, "M-1 0A11 6 0 0 1 21 0L19 0A9 4 0 0 0 1 0L-1 0z"},
{"M0 0A10 5 0 0 0 20 0", 2.0, ButtCapper, BevelJoiner, "M1 0A9 4 0 0 0 19 0L21 0A11 6 0 0 1 -1 0L1 0z"},
{"M0 0A10 5 0 0 1 20 0", 2.0, ButtCapper, BevelJoiner, "M-1 0A11 6 0 0 1 21 0L19 0A9 4 0 0 0 1 0L-1 0z"},
{"M5 2L2 2A2 2 0 0 0 0 0", 2.0, ButtCapper, BevelJoiner, "M5 3L2 3L1 2A1 1 0 0 0 0 1L0 -1A3 3 0 0 1 3 2L2 1L5 1L5 3z"},

// two circle quadrants joining at 90 degrees
//{"M0 0A10 10 0 0 1 10 10A10 10 0 0 1 0 0z", 2.0, ButtCapper, ArcsJoiner, "M0 -1A11 11 0 0 1 11 10A11 11 0 0 1 10.958 10.958A11 11 0 0 1 10 11A11 11 0 0 1 -1 0A11 11 0 0 1 -0.958 -0.958A11 11 0 0 1 0 -1zM0 1L1 0A9 9 0 0 0 10 9L9 10A9 9 0 0 0 0 1z"},
{"M0 0A10 10 0 0 1 10 10A10 10 0 0 1 0 0z", 2.0, ButtCapper, ArcsJoiner, "M0 -1A11 11 0 0 1 11 10A11 11 0 0 1 10.958 10.958A11 11 0 0 1 10 11A11 11 0 0 1 -1 0A11 11 0 0 1 -0.958 -0.958A11 11 0 0 1 0 -1zM0 1L1 0A9 9 0 0 0 10 9L9 10A9 9 0 0 0 0 1z"},

// circles joining at one point (10,0), stroke will never join
//{"M0 0A5 5 0 0 0 10 0A10 10 0 0 1 0 10", 2.0, ButtCapper, ArcsJoiner, "M1 0A4 4 0 0 0 9 0L11 0A11 11 0 0 1 0 11L0 9A9 9 0 0 0 9 0L11 0A6 6 0 0 1 -1 0L1 0z"},
{"M0 0A5 5 0 0 0 10 0A10 10 0 0 1 0 10", 2.0, ButtCapper, ArcsJoiner, "M1 0A4 4 0 0 0 9 0L11 0A11 11 0 0 1 0 11L0 9A9 9 0 0 0 9 0L11 0A6 6 0 0 1 -1 0L1 0z"},

// circle and line intersecting in one point
{"M0 0A2 2 0 0 1 2 2L5 2", 2.0, ButtCapper, ArcsClipJoiner(BevelJoiner, 10.0), "M0 -1A3 3 0 0 1 3 2L2 1L5 1L5 3L2 3L0 3A1 1 0 0 0 1 2A1 1 0 0 0 0 1L0-1z"},

// line and circle intersecting in one point
{"M0 4A2 2 0 0 0 2 2L5 2", 2.0, ButtCapper, ArcsClipJoiner(BevelJoiner, 10.0), "M0 3A1 1 0 0 0 1 2A1 1 0 0 0 0 1L2 1L5 1L5 3L2 3L3 2A3 3 0 0 1 0 5L0 3z"},
{"M5 2L2 2A2 2 0 0 0 0 0", 2.0, ButtCapper, ArcsClipJoiner(BevelJoiner, 10.0), "M5 3L2 3L0 3A1 1 0 0 0 1 2A1 1 0 0 0 0 1L0-1A3 3 0 0 1 3 2L2 1L5 1L5 3z"},
{"M5 2L2 2A2 2 0 0 1 0 4", 2.0, ButtCapper, ArcsClipJoiner(BevelJoiner, 10.0), "M5 3L2 3L3 2A3 3 0 0 1 0 5L0 3A1 1 0 0 0 1 2A1 1 0 0 0 0 1L2 1L5 1L5 3z"},

// cut by limit
{"M0 0A2 2 0 0 1 2 2L5 2", 2.0, ButtCapper, ArcsClipJoiner(BevelJoiner, 1.0), "M0 -1A3 3 0 0 1 3 2L2 1L5 1L5 3L2 3L1 2A1 1 0 0 0 0 1L0-1z"},

// no intersection
{"M0 0A2 2 0 0 1 2 2L5 2", 3.0, ButtCapper, ArcsClipJoiner(BevelJoiner, 10.0), "M0 -1.5A3.5 3.5 0 0 1 3.5 2L2 .5L5 .5L5 3.5L2 3.5L.5 2A.5 .5 0 0 0 0 1.5L0 -1.5z"},
}
for j, tt := range tts {
t.Run(fmt.Sprintf("%v", j), func(t *testing.T) {
Expand All @@ -85,3 +91,23 @@ func TestPathStrokeEllipse(t *testing.T) {
}
}
}

func TestPathOffset(t *testing.T) {
// TODO: cut at intersection on inner bends
var tts = []struct {
orig string
w float64
offset string
}{
{"M0 0L10 0L10 10L0 10z", 0.0, "M0 0L10 0L10 10L0 10z"},
{"M0 0L10 0L10 10L0 10", 1.0, ""},
{"M0 0L10 0L10 10L0 10z", 1.0, "M0 -1L10 -1A1 1 0 0 1 11 0L11 10A1 1 0 0 1 10 11L0 11A1 1 0 0 1 -1 10L-1 0A1 1 0 0 1 0 -1z"},
{"M0 0L10 0L10 10L0 10z", -1.0, "M0 1L10 1L9 0L9 10L10 9L0 9L1 10L1 0L0 1z"},
}
for j, tt := range tts {
t.Run(fmt.Sprintf("%v", j), func(t *testing.T) {
offset := MustParseSVG(tt.orig).Offset(tt.w)
test.T(t, offset, MustParseSVG(tt.offset))
})
}
}

0 comments on commit 42cfee9

Please sign in to comment.