Yay working again

Author: noriah

dsp/spectrum.go

@@ -86,7 +86,7 @@ func NewSpectrum(hz float64, size int) *Spectrum {
 		sampleSize:   size,
 		sampleRate:   hz,
 		smoothFactor: 0.1969,
-		winVar:       1.0,
+		winVar:       0.5,
 		fftBuf:       make([]complex128, fftSize),
 		bins:         make([]bin, size+1),
 		streams:      make([]*stream, 0, 2),
@@ -220,10 +220,6 @@ func (sp *Spectrum) Recalculate(bins int) int {
 
 	// set widths
 	for xB := 0; xB < bins; xB++ {
-		if sp.bins[xB].ceilFFT == sp.bins[xB].floorFFT {
-			sp.bins[xB].widthFFT = 1
-			continue
-		}
 
 		sp.bins[xB].widthFFT = sp.bins[xB].ceilFFT - sp.bins[xB].floorFFT
 	}
@@ -248,9 +244,7 @@ func (sp *Spectrum) distributeLog(bins int) {
 
 	var cCoef = 100.0 / float64(bins+1)
 
-	sp.bins[0].floorFFT = lo &
-
-	for xB := 0; xB < bins; xB++ {
+	for xB := 0; xB <= bins; xB++ {
 
 		sp.bins[xB].floorFFT = getBinBase(xB)
 		sp.bins[xB].eqVal = math.Log2(float64(xB)+2) * cCoef
@@ -269,7 +263,7 @@ func (sp *Spectrum) distributeEqual(bins int) {
 	var loF = Frequencies[0]
 	var hiF = math.Min(Frequencies[4], sp.sampleRate/2)
 	var minIdx = sp.freqToIdx(loF, math.Floor)
-	var maxIdx = sp.freqToIdx(hiF, math.Round)
+	var maxIdx = sp.freqToIdx(hiF, math.Ceil)
 
 	var size = maxIdx - minIdx
 

graphic/display.go

@@ -328,28 +328,23 @@ func (d *Display) Draw(bufs [][]float64, channels, bins int) error {
 
 	termbox.Flush()
 
-	termbox.Clear(termbox.ColorDefault, termbox.ColorDefault)
+	termbox.Clear(StyleDefault, StyleDefaultBack)
 
 	return nil
 }
 
 func stopAndTop(value float64, height int, up bool) (int, rune) {
 	if stop := int(value * NumRunes); stop < height*NumRunes {
-		if up {
-			top := BarRuneR + rune(stop%NumRunes)
-			stop = height - (stop / NumRunes)
 
-			return stop, top
+		if up {
+			return height - (stop / NumRunes), BarRuneR + rune(stop%NumRunes)
 		}
 
-		top := BarRune - rune(stop%NumRunes)
-		stop /= NumRunes
-
-		return stop, top
+		return stop / NumRunes, BarRune - rune(stop%NumRunes)
 	}
 
 	if up {
-		return 0, BarRune
+		return 0, BarRuneR
 	}
 
 	return height, BarRune

graphic/draw_down.go

@@ -3,36 +3,50 @@ package graphic
 import "github.com/nsf/termbox-go"
 
 func drawDown(bins [][]float64, count int, cfg Config, scale float64) error {
-	var cSetCount = len(bins)
-
 	var cWidth, cHeight = termbox.Size()
 
-	var cChanWidth = (cfg.BinWidth * count) - cfg.SpaceWidth
-	var cPaddedWidth = (cfg.BinWidth * count * cSetCount) - cfg.SpaceWidth
-	var cOffset = (cWidth - cPaddedWidth) / 2
-
 	var vHeight = cHeight - cfg.BaseThick
+	if vHeight < 0 {
+		vHeight = 0
+	}
 
 	scale = float64(vHeight) / scale
 
+	var cPaddedWidth = (cfg.BinWidth * count * len(bins)) - cfg.SpaceWidth
+
+	if cPaddedWidth > cWidth || cPaddedWidth < 0 {
+		cPaddedWidth = cWidth
+	}
+
 	var xBin int
-	var xCol = cOffset
+	var xCol = (cWidth - cPaddedWidth) / 2
 	var delta = 1
 
 	for xCh := range bins {
 		var stop, top = stopAndTop(bins[xCh][xBin]*scale, vHeight, false)
+		if stop += cfg.BaseThick; stop >= cHeight {
+			stop = cHeight
+			top = BarRune
+		}
 
 		var lCol = xCol + cfg.BarWidth
-		var lColMax = xCol + cChanWidth
-
-		for xCol < lColMax {
+		var lColMax = xCol + (cfg.BinWidth * count) - cfg.SpaceWidth
 
+		for {
 			if xCol >= lCol {
+				if xCol >= lColMax {
+					break
+				}
+
 				if xBin += delta; xBin >= count || xBin < 0 {
 					break
 				}
 
 				stop, top = stopAndTop(bins[xCh][xBin]*scale, vHeight, false)
+				if stop += cfg.BaseThick; stop >= cHeight {
+					stop = cHeight
+					top = BarRune
+				}
 
 				xCol += cfg.SpaceWidth
 				lCol = xCol + cfg.BarWidth
@@ -65,20 +79,3 @@ func drawDown(bins [][]float64, count int, cfg Config, scale float64) error {
 
 	return nil
 }
-
-// var stopAndTop = func(value float64) (stop int, top int) {
-// 	if value *= scale; value < float64(vHeight) {
-// 		top = int(value * NumRunes)
-// 	} else {
-// 		top = vHeight * NumRunes
-// 	}
-// 	stop = (top / NumRunes) + cfg.BaseThick
-// 	top %= NumRunes
-
-// 	if stop > cHeight {
-// 		stop = cHeight
-// 		top = 0
-// 	}
-
-// 	return
-// }

graphic/draw_up.go

@@ -2,7 +2,6 @@ package graphic
 
 import "github.com/nsf/termbox-go"
 
-// DrawUp takes data and draws
 func drawUp(bins [][]float64, count int, cfg Config, scale float64) error {
 	var cWidth, cHeight = termbox.Size()
 

graphic/draw_updown.go

@@ -30,9 +30,9 @@ func drawUpDown(bins [][]float64, count int, cfg Config, scale float64) error {
 
 	var lStop, lTop = stopAndTop(bins[0][xBin]*scale, centerStart, true)
 	var rStop, rTop = stopAndTop(bins[1%cSetCount][xBin]*scale, centerStart, false)
-	if rStop += centerStop; rStop > cHeight {
+	if rStop += centerStop; rStop >= cHeight {
 		rStop = cHeight
-		rTop = 0
+		rTop = BarRune
 	}
 
 	var lCol = xCol + cfg.BarWidth
@@ -51,10 +51,9 @@ func drawUpDown(bins [][]float64, count int, cfg Config, scale float64) error {
 
 			lStop, lTop = stopAndTop(bins[0][xBin]*scale, centerStart, true)
 			rStop, rTop = stopAndTop(bins[1%cSetCount][xBin]*scale, centerStart, false)
-
-			if rStop += centerStop; rStop > cHeight {
+			if rStop += centerStop; rStop >= cHeight {
 				rStop = cHeight
-				rTop = 0
+				rTop = BarRune
 			}
 
 			xCol += cfg.SpaceWidth