Downgrade to pre-Blessed version of git.wow.st/gmp/ble.

Improve layout generally and add wide (horizontal) layouts.

Add stopwatch widget.
This commit is contained in:
Greg 2019-12-06 12:16:46 -05:00
parent 14bbbf0679
commit 31fa374c7f
2 changed files with 180 additions and 49 deletions

2
go.mod
View File

@ -4,7 +4,7 @@ go 1.13
require ( require (
gioui.org v0.0.0-20191126175243-2ca2e5462f16 gioui.org v0.0.0-20191126175243-2ca2e5462f16
git.wow.st/gmp/ble v0.0.0-20191205134941-3bc712870db2 git.wow.st/gmp/ble v0.0.0-20191127164604-2af636b9461a
github.com/google/go-github/v24 v24.0.1 // indirect github.com/google/go-github/v24 v24.0.1 // indirect
golang.org/x/oauth2 v0.0.0-20191122200657-5d9234df094c // indirect golang.org/x/oauth2 v0.0.0-20191122200657-5d9234df094c // indirect
gopkg.in/yaml.v2 v2.2.7 gopkg.in/yaml.v2 v2.2.7

163
main.go
View File

@ -9,6 +9,7 @@ import (
"log" "log"
"os" "os"
"path" "path"
"time"
"git.wow.st/gmp/ble" "git.wow.st/gmp/ble"
@ -77,9 +78,25 @@ func hrDecode(x []byte) int {
} }
} }
type Stopwatch struct {
lasttime time.Time
elapsed time.Time
running bool
startstopBtn *widget.Button
resetBtn *widget.Button
h, m, s int
}
func NewStopwatch() Stopwatch {
return Stopwatch{
startstopBtn: &widget.Button{},
resetBtn: &widget.Button{},
}
}
func eventloop() { func eventloop() {
w := app.NewWindow( w := app.NewWindow(
app.Size(unit.Dp(400), unit.Dp(400)), app.Size(unit.Dp(350), unit.Dp(600)),
app.Title("HRM"), app.Title("HRM"),
) )
gofont.Register() gofont.Register()
@ -121,9 +138,21 @@ func eventloop() {
) )
} }
appname := func() { th.Body1("Heart Rate Monitor").Layout(gtx) } appname := func() {
appstate := func() { th.Body1(state).Layout(gtx) } layout.Align(layout.Center).Layout(gtx, func() {
periphname := func() { th.Body1(periph.Name).Layout(gtx) } th.Body1("Heart Rate Monitor").Layout(gtx)
})
}
appstate := func() {
layout.Align(layout.Center).Layout(gtx, func() {
th.Body1(state).Layout(gtx)
})
}
periphname := func() {
layout.Align(layout.Center).Layout(gtx, func() {
th.Body1("COOSPO").Layout(gtx)
})
}
leftbar := func() { leftbar := func() {
f := &layout.Flex{Axis: layout.Vertical} f := &layout.Flex{Axis: layout.Vertical}
@ -171,9 +200,7 @@ func eventloop() {
connpage = func() { connpage = func() {
f.Layout(gtx, f.Layout(gtx,
f.Rigid(gtx, appname), f.Rigid(gtx, appname),
f.Rigid(gtx, func() { f.Rigid(gtx, appstate),
th.Body1("Connecting").Layout(gtx)
}),
f.Rigid(gtx, periphname), f.Rigid(gtx, periphname),
f.Rigid(gtx, func() { f.Rigid(gtx, func() {
th.Button("Cancel").Layout(gtx, backBtn) th.Button("Cancel").Layout(gtx, backBtn)
@ -190,10 +217,12 @@ func eventloop() {
) )
} }
hrcircle := func() { hrcircle := func() int {
var w, h1 float32
layout.Align(layout.Center).Layout(gtx, func() {
blue := color.RGBA{0x3f, 0x51, 0xb5, 255} blue := color.RGBA{0x3f, 0x51, 0xb5, 255}
white := color.RGBA{255, 255, 255, 255} white := color.RGBA{255, 255, 255, 255}
w, h1 := float32(gtx.Constraints.Width.Max), float32(gtx.Constraints.Height.Max) w, h1 = float32(gtx.Constraints.Width.Max), float32(gtx.Constraints.Height.Max)
if w < h1 { if w < h1 {
h1 = w h1 = w
} }
@ -219,16 +248,118 @@ func eventloop() {
l.Layout(gtx) l.Layout(gtx)
}) })
gtx.Dimensions.Size = image.Point{int(h1), int(h1)} gtx.Dimensions.Size = image.Point{int(h1), int(h1)}
})
return int(h1)
} }
sw := NewStopwatch()
stopwatch := func() {
startstoptxt := "start"
if sw.running {
sw.elapsed = sw.elapsed.Add(time.Since(sw.lasttime))
startstoptxt = "stop"
}
sw.lasttime = time.Now()
f := layout.Flex{Axis: layout.Vertical}
f.Layout(gtx,
f.Rigid(gtx, func() {
layout.Align(layout.Center).Layout(gtx, func() {
gtx.Constraints.Width.Max = 1e6
th.H4(sw.elapsed.Format("15:04:05.00")).Layout(gtx)
})
}),
f.Rigid(gtx, func() {
f2 := layout.Flex{Axis: layout.Horizontal}
gtx.Constraints.Height.Min = 100
f2.Layout(gtx,
f2.Flex(gtx, 0.5, func() {
layout.UniformInset(unit.Dp(2)).Layout(gtx, func() {
th.Button(startstoptxt).Layout(gtx, sw.startstopBtn)
})
}),
f2.Flex(gtx, 0.5, func() {
layout.UniformInset(unit.Dp(2)).Layout(gtx, func() {
th.Button("reset").Layout(gtx, sw.resetBtn)
})
}),
)
if sw.startstopBtn.Clicked(gtx) {
if sw.running {
sw.running = false
} else {
sw.running = true
}
}
if sw.resetBtn.Clicked(gtx) {
sw.elapsed = time.Time{}
sw.running = false
}
}),
)
}
swidth := new(int)
*swidth = 900
hrpage = func() { hrpage = func() {
stopbtn := func() {
gtx.Constraints.Width.Min = *swidth
gtx.Constraints.Height.Min = 100
layout.UniformInset(unit.Dp(2)).Layout(gtx, func() {
th.Button("Disconnect").Layout(gtx, backBtn)
})
}
if wide {
f2 := &layout.Flex{Axis: layout.Horizontal}
f2.Layout(gtx,
f2.Flex(gtx, 0.4, func() {
f3 := &layout.Flex{Axis: layout.Vertical}
c1 := f3.Rigid(gtx, func() {
appname()
*swidth = gtx.Dimensions.Size.X
})
c2 := f3.Rigid(gtx, func() {
periphname()
s2 := gtx.Dimensions.Size.X
if s2 > *swidth {
*swidth = s2
}
})
c3 := f3.Rigid(gtx, stopwatch)
c4 := f3.Rigid(gtx, stopbtn)
f3.Layout(gtx,
c1,
f3.Rigid(gtx, appstate),
c2,
f3.Flex(gtx, 1.0, func() { th.Body1("").Layout(gtx) }),
c3,
c4,
)
}),
f2.Flex(gtx, 0.6, func() { hrcircle() }),
)
} else { // !wide
c1 := f.Rigid(gtx, func() {
layout.Align(layout.Center).Layout(gtx, func() {
gtx.Constraints.Width.Min = *swidth
gtx.Constraints.Width.Max = *swidth
stopwatch()
})
})
c2 := f.Rigid(gtx, func() {
layout.Align(layout.Center).Layout(gtx, stopbtn)
})
f.Layout(gtx, f.Layout(gtx,
f.Rigid(gtx, appname), f.Rigid(gtx, appname),
f.Rigid(gtx, appstate),
f.Rigid(gtx, periphname), f.Rigid(gtx, periphname),
f.Rigid(gtx, func() { f.Flex(gtx, 1.0, func() {
layout.UniformInset(unit.Dp(2)).Layout(gtx, func() { *swidth = hrcircle()
th.Button("Stop").Layout(gtx, backBtn) }),
}) c1,
c2,
)
}
if backBtn.Clicked(gtx) { if backBtn.Clicked(gtx) {
ble.Disconnect(periph) ble.Disconnect(periph)
periphs = periphs[:0] periphs = periphs[:0]
@ -238,15 +369,15 @@ func eventloop() {
state = "scanning" state = "scanning"
page = scanpage page = scanpage
} }
}),
f.Rigid(gtx, hrcircle),
)
} }
page = offpage page = offpage
t := time.NewTicker(time.Second/30)
for { for {
select { select {
case <-t.C:
w.Invalidate()
case e := <-b.Events(): case e := <-b.Events():
switch e := e.(type) { switch e := e.(type) {
case ble.UpdateStateEvent: case ble.UpdateStateEvent: