From 6ae905292363c07cb227f8445c8af32adab55cd0 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Wed, 6 May 2015 21:27:53 +0200 Subject: Fix correction --- cutter.go | 4 ++++ main.go | 2 +- pic.go | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cutter.go b/cutter.go index 8d66ada..cc65cd0 100644 --- a/cutter.go +++ b/cutter.go @@ -14,6 +14,10 @@ func (p Point) Add(u Point) Point { return Point{p.X + u.X, p.Y + u.Y} } +func (p Point) Sub(u Point) Point { + return Point{p.X - u.X, p.Y - u.Y} +} + func (p Point) AddX(u float64) Point { return Point{p.X + u, p.Y} } diff --git a/main.go b/main.go index 9b7c75f..307e0c2 100644 --- a/main.go +++ b/main.go @@ -41,6 +41,6 @@ func main() { //fmt.Println("Call Gin", c.CallGin()) //c.MustMarks(Point{19 * CM, 18 * CM}) - c.DrawPic(Point{-11 * IN, 0}) + c.DrawPic(Point{11 * IN, 0}) } diff --git a/pic.go b/pic.go index bee5745..5a80605 100644 --- a/pic.go +++ b/pic.go @@ -42,9 +42,9 @@ func parsePage() (pa Page) { func (c Cutter) DrawPic(cor Point) { for _, path := range parsePage() { - c.Move(path[0].Add(cor)) + c.Move(cor.Sub(path[0])) for _, p := range path[1:] { - c.Draw(p.Add(cor)) + c.Draw(cor.Sub(p)) } } } -- cgit v1.2.3