OrgGo
/
termui
mirror of https://github.com/gizak/termui.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Do not print the label if the value is 0 and fix some OutofIndex Panic error on very large dataset

This commit is contained in:
dhilipkumars 2015-04-18 00:38:59 -04:00
parent 373cd50f32
commit d4551211f3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mbar.go
View File

@ -82,14 +82,14 @@ func (bc *MBarChart) layout() {
LabelLen = bc.minDataLen LabelLen = bc.minDataLen
} }
for i := 0; i < LabelLen; i++ { for i := 0; i < LabelLen && i < bc.numBar; i++ {
bc.labels[i] = trimStr2Runes(bc.DataLabels[i], bc.BarWidth) bc.labels[i] = trimStr2Runes(bc.DataLabels[i], bc.BarWidth)
} }
for i := 0; i < bc.numStack; i++ { for i := 0; i < bc.numStack; i++ {
bc.dataNum[i] = make([][]rune, len(bc.Data[i])) bc.dataNum[i] = make([][]rune, len(bc.Data[i]))
//For each stack of bar calcualte the rune //For each stack of bar calcualte the rune
for j := 0; j < LabelLen; j++ { for j := 0; j < LabelLen && i < bc.numBar; j++ {
n := bc.Data[i][j] n := bc.Data[i][j]
s := fmt.Sprint(n) s := fmt.Sprint(n)
bc.dataNum[i][j] = trimStr2Runes(s, bc.BarWidth) bc.dataNum[i][j] = trimStr2Runes(s, bc.BarWidth)
@ -175,7 +175,7 @@ func (bc *MBarChart) Buffer() []Point {
ph = 0 //re-initialize previous height ph = 0 //re-initialize previous height
for i1 := 0; i1 < bc.numStack; i1++ { for i1 := 0; i1 < bc.numStack; i1++ {
h := int(float64(bc.Data[i1][i]) / bc.scale) h := int(float64(bc.Data[i1][i]) / bc.scale)
for j := 0; j < len(bc.dataNum[i1][i]); j++ { for j := 0; j < len(bc.dataNum[i1][i]) && h > 0; j++ {
p := Point{} p := Point{}
p.Ch = bc.dataNum[i1][i][j] p.Ch = bc.dataNum[i1][i][j]
p.Fg = bc.NumColor[i1] p.Fg = bc.NumColor[i1]
@ -186,7 +186,7 @@ func (bc *MBarChart) Buffer() []Point {
if h == 0 { if h == 0 {
p.Bg = bc.BgColor p.Bg = bc.BgColor
} }
p.X = bc.innerX + oftX + (bc.BarWidth-len(bc.dataNum[i]))/2 + j p.X = bc.innerX + oftX + (bc.BarWidth-len(bc.dataNum[i1][i]))/2 + j
p.Y = bc.innerY + bc.innerHeight - 2 - ph p.Y = bc.innerY + bc.innerHeight - 2 - ph
ps = append(ps, p) ps = append(ps, p)
} }