Merge remote-tracking branch 'refs/remotes/origin/master' into refactoring

example/dashboard.go

@@ -47,7 +47,7 @@ func main() {
 	spark := ui.Sparkline{}
 	spark.Height = 1
 	spark.Title = "srv 0:"
-	spdata := []int{4, 2, 1, 6, 3, 9, 1, 4, 2, 15, 14, 9, 8, 6, 10, 13, 15, 12, 10, 5, 3, 6, 1, 7, 10, 10, 14, 13, 6}
+	spdata := []int{4, 2, 1, 6, 3, 9, 1, 4, 2, 15, 14, 9, 8, 6, 10, 13, 15, 12, 10, 5, 3, 6, 1, 7, 10, 10, 14, 13, 6, 4, 2, 1, 6, 3, 9, 1, 4, 2, 15, 14, 9, 8, 6, 10, 13, 15, 12, 10, 5, 3, 6, 1, 7, 10, 10, 14, 13, 6, 4, 2, 1, 6, 3, 9, 1, 4, 2, 15, 14, 9, 8, 6, 10, 13, 15, 12, 10, 5, 3, 6, 1, 7, 10, 10, 14, 13, 6, 4, 2, 1, 6, 3, 9, 1, 4, 2, 15, 14, 9, 8, 6, 10, 13, 15, 12, 10, 5, 3, 6, 1, 7, 10, 10, 14, 13, 6}
 	spark.Data = spdata
 	spark.LineColor = ui.ColorCyan
 	spark.TitleColor = ui.ColorWhite
@@ -119,8 +119,8 @@ func main() {
 	draw := func(t int) {
 		g.Percent = t % 101
 		list.Items = strs[t%9:]
-		sp.Lines[0].Data = spdata[t%10:]
-		sp.Lines[1].Data = spdata[t/2%10:]
+		sp.Lines[0].Data = spdata[:30+t%50]
+		sp.Lines[1].Data = spdata[:35+t%50]
 		lc.Data = sinps[t/2:]
 		lc1.Data = sinps[2*t:]
 		bc.Data = bcdata[t/2%10:]

example/gauge.go

@@ -55,7 +55,15 @@ func main() {
 	g1.Border.Fg = termui.ColorWhite
 	g1.Border.LabelFgClr = termui.ColorMagenta
 
-	termui.Render(g0, g1, g2, gg)
+	g3 := termui.NewGauge()
+	g3.Percent = 50
+	g3.Width = 50
+	g3.Height = 3
+	g3.Y = 11
+	g3.Border.Label = "Gauge with custom label"
+	g3.Label = "{{percent}}% (100MBs free)"
+	g3.LabelAlign = termui.AlignRight
 
+	termui.Render(g0, g1, g2, g3)
 	<-termui.EventCh()
 }

example/grid.go

@@ -8,7 +8,6 @@ package main
 
 import ui "github.com/gizak/termui"
 import "math"
-
 import "time"
 
 func main() {
@@ -39,7 +38,7 @@ func main() {
 	spark := ui.Sparkline{}
 	spark.Height = 8
 	spdata := sinpsint
-	spark.Data = spdata
+	spark.Data = spdata[:100]
 	spark.LineColor = ui.ColorCyan
 	spark.TitleColor = ui.ColorWhite
 
@@ -92,34 +91,44 @@ func main() {
 	// calculate layout
 	ui.Body.Align()
 
-	draw := func(t int) {
-		sp.Lines[0].Data = spdata[t:]
-		lc.Data = sinps[2*t:]
-		ui.Render(ui.Body)
+	done := make(chan bool)
+	redraw := make(chan bool)
+
+	update := func() {
+		for i := 0; i < 103; i++ {
+			for _, g := range gs {
+				g.Percent = (g.Percent + 3) % 100
+			}
+
+			sp.Lines[0].Data = spdata[:100+i]
+			lc.Data = sinps[2*i:]
+
+			time.Sleep(time.Second / 2)
+			redraw <- true
+		}
+		done <- true
 	}
 
 	evt := ui.EventCh()
 
-	i := 0
+	ui.Render(ui.Body)
+	go update()
+
 	for {
 		select {
 		case e := <-evt:
 			if e.Type == ui.EventKey && e.Ch == 'q' {
 				return
 			}
-		default:
-			for _, g := range gs {
-				g.Percent = (g.Percent + 3) % 100
+			if e.Type == ui.EventResize {
+				ui.Body.Width = ui.TermWidth()
+				ui.Body.Align()
+				go func() { redraw <- true }()
 			}
-			ui.Body.Width = ui.TermWidth()
-			ui.Body.Align()
-
-			draw(i)
-			i++
-			if i == 102 {
-				return
-			}
-			time.Sleep(time.Second / 2)
+		case <-done:
+			return
+		case <-redraw:
+			ui.Render(ui.Body)
 		}
 	}
 }

example/mbarchart.go

@@ -0,0 +1,50 @@
+// Copyright 2015 Zack Guo <gizak@icloud.com>. All rights reserved.
+// Use of this source code is governed by a MIT license that can
+// be found in the LICENSE file.
+
+// +build ignore
+
+package main
+
+import "github.com/gizak/termui"
+
+func main() {
+	err := termui.Init()
+	if err != nil {
+		panic(err)
+	}
+	defer termui.Close()
+
+	termui.UseTheme("helloworld")
+
+	bc := termui.NewMBarChart()
+	math := []int{90, 85, 90, 80}
+	english := []int{70, 85, 75, 60}
+	science := []int{75, 60, 80, 85}
+	compsci := []int{100, 100, 100, 100}
+	bc.Data[0] = math
+	bc.Data[1] = english
+	bc.Data[2] = science
+	bc.Data[3] = compsci
+	studentsName := []string{"Ken", "Rob", "Dennis", "Linus"}
+	bc.Border.Label = "Student's Marks X-Axis=Name Y-Axis=Marks[Math,English,Science,ComputerScience] in %"
+	bc.Width = 100
+	bc.Height = 50
+	bc.Y = 10
+	bc.BarWidth = 10
+	bc.DataLabels = studentsName
+	bc.ShowScale = true //Show y_axis scale value (min and max)
+	bc.SetMax(400)
+
+	bc.TextColor = termui.ColorGreen    //this is color for label (x-axis)
+	bc.BarColor[3] = termui.ColorGreen  //BarColor for computerscience
+	bc.BarColor[1] = termui.ColorYellow //Bar Color for english
+	bc.NumColor[3] = termui.ColorRed    // Num color for computerscience
+	bc.NumColor[1] = termui.ColorRed    // num color for english
+
+	//Other colors are automatically populated, btw All the students seems do well in computerscience. :p
+
+	termui.Render(bc)
+
+	<-termui.EventCh()
+}