aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--main.go7
-rw-r--r--misc.go9
-rw-r--r--pic.go9
3 files changed, 10 insertions, 15 deletions
diff --git a/main.go b/main.go
index 0c3c012..97d3fd2 100644
--- a/main.go
+++ b/main.go
@@ -43,12 +43,7 @@ func main() {
if c.SearchMarks(Point{19 * CM, 18 * CM}) {
fmt.Println("Reg Marks ok")
-
- fmt.Println("Offset", c.ReadOffset())
- fmt.Println("Upper Right", c.ReadUpperRight())
- fmt.Println("Lower Left", c.ReadLowerLeft())
-
- c.DrawCircles()
+ c.DrawPic()
}
}
diff --git a/misc.go b/misc.go
index 3366770..c271ce9 100644
--- a/misc.go
+++ b/misc.go
@@ -29,15 +29,6 @@ func (c Cutter) DrawCircles() {
}
}
-func (c Cutter) DrawPic() {
- for _, path := range parsePage() {
- c.Move(path[0])
- for _, p := range path[1:] {
- c.Draw(p)
- }
- }
-}
-
func (c Cutter) MustMarks(p Point) {
if !c.SearchMarks(p) {
log.Fatal("marks not found")
diff --git a/pic.go b/pic.go
index 9ab99d1..a01ee20 100644
--- a/pic.go
+++ b/pic.go
@@ -39,3 +39,12 @@ func parsePage() (pa Page) {
}
return pa
}
+
+func (c Cutter) DrawPic() {
+ for _, path := range parsePage() {
+ c.Move(path[0])
+ for _, p := range path[1:] {
+ c.Draw(p)
+ }
+ }
+}