From c7e2456ced2ae4f23dcfe34194d7042357a75582 Mon Sep 17 00:00:00 2001 From: Michael Dvorkin Date: Tue, 23 Jul 2013 14:50:10 -0700 Subject: [PATCH] Made screen.Draw() to accept variable number of arguments --- lib/screen.go | 18 ++++++++++-------- mop.go | 6 ++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/screen.go b/lib/screen.go index 9ca23c2..8e67d27 100644 --- a/lib/screen.go +++ b/lib/screen.go @@ -62,14 +62,16 @@ func (self *Screen) Close() { } //----------------------------------------------------------------------------- -func (self *Screen) Draw(ptr interface{}) { - switch ptr.(type) { - case *Market: - object := ptr.(*Market) - self.draw(object.Fetch().Format()) - case *Quotes: - object := ptr.(*Quotes) - self.draw(object.Fetch().Format()) +func (self *Screen) Draw(objects ...interface{}) { + for _, ptr := range objects { + switch ptr.(type) { + case *Market: + object := ptr.(*Market) + self.draw(object.Fetch().Format()) + case *Quotes: + object := ptr.(*Quotes) + self.draw(object.Fetch().Format()) + } } } diff --git a/mop.go b/mop.go index f997b94..3b8a63b 100644 --- a/mop.go +++ b/mop.go @@ -24,8 +24,7 @@ func mainLoop(screen *mop.Screen, profile *mop.Profile) { market := new(mop.Market).Initialize().Fetch() quotes := new(mop.Quotes).Initialize(market, profile) - screen.Draw(market) - screen.Draw(quotes) + screen.Draw(market, quotes) loop: for { @@ -48,8 +47,7 @@ loop: } case termbox.EventResize: screen.Resize() - screen.Draw(market) - screen.Draw(quotes) + screen.Draw(market, quotes) } case <-timestamp_queue.C: