Skip to content

Plot: minimum value of Y-axis is configurable #259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iamquang95 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Plot: minimum value of Y-axis is configurable #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions v3/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,21 @@ func GetMaxFloat64From2dSlice(slices [][]float64) (float64, error) {
return max, nil
}

func GetMinFloat64From2dSlice(slices [][]float64) (float64, error) {
if len(slices) == 0 || len(slices[0]) == 0 {
return 0, fmt.Errorf("cannot get min value from empty slice")
}
min := slices[0][0]
for _, slice := range slices {
for _, val := range slice {
if val < min {
min = val
}
}
}
return min, nil
}

func RoundFloat64(x float64) float64 {
return math.Floor(x + 0.5)
}
Expand Down
31 changes: 19 additions & 12 deletions v3/widgets/plot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ type Plot struct {

Data [][]float64
DataLabels []string
MinVal float64
MaxVal float64

LineColors []Color
Expand Down Expand Up @@ -76,15 +77,16 @@ func NewPlot() *Plot {
}
}

func (self *Plot) renderBraille(buf *Buffer, drawArea image.Rectangle, maxVal float64) {
func (self *Plot) renderBraille(buf *Buffer, drawArea image.Rectangle, minVal float64, maxVal float64) {
canvas := NewCanvas()
canvas.Rectangle = drawArea
h := maxVal - minVal

switch self.PlotType {
case ScatterPlot:
for i, line := range self.Data {
for j, val := range line {
height := int((val / maxVal) * float64(drawArea.Dy()-1))
height := int(((val - minVal) / h) * float64(drawArea.Dy()-1))
canvas.SetPoint(
image.Pt(
(drawArea.Min.X+(j*self.HorizontalScale))*2,
Expand All @@ -98,7 +100,7 @@ func (self *Plot) renderBraille(buf *Buffer, drawArea image.Rectangle, maxVal fl
for i, line := range self.Data {
previousHeight := int((line[1] / maxVal) * float64(drawArea.Dy()-1))
for j, val := range line[1:] {
height := int((val / maxVal) * float64(drawArea.Dy()-1))
height := int(((val - minVal) / h) * float64(drawArea.Dy()-1))
canvas.SetLine(
image.Pt(
(drawArea.Min.X+(j*self.HorizontalScale))*2,
Expand All @@ -118,12 +120,13 @@ func (self *Plot) renderBraille(buf *Buffer, drawArea image.Rectangle, maxVal fl
canvas.Draw(buf)
}

func (self *Plot) renderDot(buf *Buffer, drawArea image.Rectangle, maxVal float64) {
func (self *Plot) renderDot(buf *Buffer, drawArea image.Rectangle, minVal float64, maxVal float64) {
h := maxVal - minVal
switch self.PlotType {
case ScatterPlot:
for i, line := range self.Data {
for j, val := range line {
height := int((val / maxVal) * float64(drawArea.Dy()-1))
height := int(((val - minVal) / h) * float64(drawArea.Dy()-1))
point := image.Pt(drawArea.Min.X+(j*self.HorizontalScale), drawArea.Max.Y-1-height)
if point.In(drawArea) {
buf.SetCell(
Expand All @@ -137,7 +140,7 @@ func (self *Plot) renderDot(buf *Buffer, drawArea image.Rectangle, maxVal float6
for i, line := range self.Data {
for j := 0; j < len(line) && j*self.HorizontalScale < drawArea.Dx(); j++ {
val := line[j]
height := int((val / maxVal) * float64(drawArea.Dy()-1))
height := int(((val - maxVal) / h) * float64(drawArea.Dy()-1))
buf.SetCell(
NewCell(self.DotMarkerRune, NewStyle(SelectColor(self.LineColors, i))),
image.Pt(drawArea.Min.X+(j*self.HorizontalScale), drawArea.Max.Y-1-height),
Expand All @@ -147,7 +150,8 @@ func (self *Plot) renderDot(buf *Buffer, drawArea image.Rectangle, maxVal float6
}
}

func (self *Plot) plotAxes(buf *Buffer, maxVal float64) {
func (self *Plot) plotAxes(buf *Buffer, minVal float64, maxVal float64) {
h := maxVal - minVal
// draw origin cell
buf.SetCell(
NewCell(BOTTOM_LEFT, NewStyle(ColorWhite)),
Expand Down Expand Up @@ -188,10 +192,11 @@ func (self *Plot) plotAxes(buf *Buffer, maxVal float64) {
x += (len(label) + xAxisLabelsGap) * self.HorizontalScale
}
// draw y axis labels
verticalScale := maxVal / float64(self.Inner.Dy()-xAxisLabelsHeight-1)
verticalScale := h / float64(self.Inner.Dy()-xAxisLabelsHeight-1)
for i := 0; i*(yAxisLabelsGap+1) < self.Inner.Dy()-1; i++ {
yVal := minVal + float64(i)*verticalScale*(yAxisLabelsGap+1)
buf.SetString(
fmt.Sprintf("%.2f", float64(i)*verticalScale*(yAxisLabelsGap+1)),
fmt.Sprintf("%.2f", yVal),
NewStyle(ColorWhite),
image.Pt(self.Inner.Min.X, self.Inner.Max.Y-(i*(yAxisLabelsGap+1))-2),
)
Expand All @@ -202,12 +207,14 @@ func (self *Plot) Draw(buf *Buffer) {
self.Block.Draw(buf)

maxVal := self.MaxVal
minVal := self.MinVal
if maxVal == 0 {
maxVal, _ = GetMaxFloat64From2dSlice(self.Data)
minVal, _ = GetMinFloat64From2dSlice(self.Data)
}

if self.ShowAxes {
self.plotAxes(buf, maxVal)
self.plotAxes(buf, minVal, maxVal)
}

drawArea := self.Inner
Expand All @@ -220,8 +227,8 @@ func (self *Plot) Draw(buf *Buffer) {

switch self.Marker {
case MarkerBraille:
self.renderBraille(buf, drawArea, maxVal)
self.renderBraille(buf, drawArea, minVal, maxVal)
case MarkerDot:
self.renderDot(buf, drawArea, maxVal)
self.renderDot(buf, drawArea, minVal, maxVal)
}
}