aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2015-05-15 13:41:24 +0200
committerDimitri Sokolyuk <demon@dim13.org>2015-05-15 13:41:24 +0200
commit45d4b0df550fe3e2d56e25bc84717c289a134259 (patch)
tree5fcf89f14af0e7970f7f90ad9ce19080563ddad7
parent70785ed7332d2673ba2234d451b713e6a7167f2f (diff)
Use new api
-rw-r--r--main.go17
-rw-r--r--pic.go12
2 files changed, 10 insertions, 19 deletions
diff --git a/main.go b/main.go
index 217d049..72c2896 100644
--- a/main.go
+++ b/main.go
@@ -27,7 +27,9 @@ func main() {
defer dev.Close()
- c := NewCutter(dev.Handle(), Portrait, 0)
+ handle := dev.Handle()
+
+ c := NewCutter(handle, Portrait, 0)
defer c.Home()
//defer c.LineType(Solid)
@@ -49,16 +51,7 @@ func main() {
c.Send(*cmd)
//log.Println(c.returnString())
} else {
-// c.PrintStdin()
- //c.DrawPic()
+ PrintStdin(handle.Writer)
+ //DrawPic(handle.Writer)
}
- //Point{100, 200}.Move(c.Writer)
- //Point{100, 1000}.Draw(c.Writer)
- Path{
- Point{1000, 1000},
- Point{1000, 2000},
- Point{2000, 1000},
- Point{2000, 2000},
- }.Curve(c.Writer, 1)
- log.Println(Version(c.ReadWriter))
}
diff --git a/pic.go b/pic.go
index ff4e5f3..505b16b 100644
--- a/pic.go
+++ b/pic.go
@@ -36,12 +36,10 @@ func parsePage() (pa Page) {
return pa
}
-func (c Cutter) DrawPic() {
- c.Orientation(Landscape)
- for _, path := range parsePage() {
- c.Move(path[0])
- for _, p := range path[1:] {
- c.Draw(p)
- }
+func DrawPic(c *bufio.Writer) {
+ Landscape.Orientation(c)
+ for _, p := range parsePage() {
+ p[0].Move(c)
+ p[1:].Draw(c)
}
}