0.4.5 Added text color to beads. /JL
This commit is contained in:
35
color.go
35
color.go
@@ -27,6 +27,7 @@ type (
|
|||||||
Red byte
|
Red byte
|
||||||
Green byte
|
Green byte
|
||||||
Blue byte
|
Blue byte
|
||||||
|
TextColor walk.Color
|
||||||
}
|
}
|
||||||
|
|
||||||
Serie struct {
|
Serie struct {
|
||||||
@@ -42,6 +43,16 @@ type (
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
func (bc *BeadColor) SetColor(r byte, g byte, b byte) {
|
||||||
|
bc.Red = r
|
||||||
|
bc.Green = g
|
||||||
|
bc.Blue = b
|
||||||
|
}
|
||||||
|
|
||||||
|
func (bc *BeadColor) SetTextColor() {
|
||||||
|
bc.TextColor = walk.RGB(255-bc.Red, 255-bc.Green, 255-bc.Blue)
|
||||||
|
}
|
||||||
|
|
||||||
func ShowBeads(mw *MyMainWindow, serie string) {
|
func ShowBeads(mw *MyMainWindow, serie string) {
|
||||||
for _, bead := range mw.beads {
|
for _, bead := range mw.beads {
|
||||||
bead.Color.SetVisible(false)
|
bead.Color.SetVisible(false)
|
||||||
@@ -74,13 +85,6 @@ func CreateBeadsGroup(mw *MyMainWindow) {
|
|||||||
gb, _ := walk.NewGroupBox(mw.leftPanel)
|
gb, _ := walk.NewGroupBox(mw.leftPanel)
|
||||||
gb.SetTitle("Beads")
|
gb.SetTitle("Beads")
|
||||||
gb.SetLayout(walk.NewVBoxLayout())
|
gb.SetLayout(walk.NewVBoxLayout())
|
||||||
btn, _ := walk.NewPushButton(gb)
|
|
||||||
btn.SetText("Select all colors")
|
|
||||||
btn.Clicked().Attach(func() {
|
|
||||||
for _, bead := range mw.beads {
|
|
||||||
bead.Checkbox.SetChecked(true)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
mw.colors, _ = walk.NewScrollView(gb)
|
mw.colors, _ = walk.NewScrollView(gb)
|
||||||
mw.colors.SetLayout(walk.NewVBoxLayout())
|
mw.colors.SetLayout(walk.NewVBoxLayout())
|
||||||
LoadBeads(mw)
|
LoadBeads(mw)
|
||||||
@@ -123,14 +127,11 @@ func NewBeadColor(mw *MyMainWindow, name string, id int, red byte, green byte, b
|
|||||||
color := new(BeadColor)
|
color := new(BeadColor)
|
||||||
color.Color = cm
|
color.Color = cm
|
||||||
color.SetBackgroundColor(walk.RGB(red, green, blue))
|
color.SetBackgroundColor(walk.RGB(red, green, blue))
|
||||||
color.Checkbox, err = walk.NewCheckBox(cm)
|
color.SetColor(red, green, blue)
|
||||||
if err != nil {
|
color.SetTextColor()
|
||||||
log.Panic(err)
|
lbl, _ := walk.NewLabel(cm)
|
||||||
}
|
lbl.SetTextColor(color.TextColor)
|
||||||
err = color.Checkbox.SetText(name)
|
lbl.SetText(name)
|
||||||
if err != nil {
|
|
||||||
log.Panic(err)
|
|
||||||
}
|
|
||||||
walk.NewHSpacer(cm)
|
walk.NewHSpacer(cm)
|
||||||
color.add, err = walk.NewImageView(cm)
|
color.add, err = walk.NewImageView(cm)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -233,7 +234,9 @@ func NewBeadColor(mw *MyMainWindow, name string, id int, red byte, green byte, b
|
|||||||
color.ErrorTooltip.AddTool(color.error)
|
color.ErrorTooltip.AddTool(color.error)
|
||||||
color.error.SetVisible(false)
|
color.error.SetVisible(false)
|
||||||
|
|
||||||
lbl, _ := walk.NewLabel(cm)
|
//Setup color label
|
||||||
|
lbl, _ = walk.NewLabel(cm)
|
||||||
|
lbl.SetTextColor(color.TextColor)
|
||||||
lbl.SetText(fmt.Sprint("Color ID: ", id))
|
lbl.SetText(fmt.Sprint("Color ID: ", id))
|
||||||
cm.SetBackground(color.backgroundColor)
|
cm.SetBackground(color.backgroundColor)
|
||||||
|
|
||||||
|
|||||||
2
main.go
2
main.go
@@ -32,7 +32,7 @@ type MyMainWindow struct {
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
AppName string = "BeadImager"
|
AppName string = "BeadImager"
|
||||||
Version string = "0.4.4"
|
Version string = "0.4.5"
|
||||||
CopyRight string = "©2022 Jan Lerking"
|
CopyRight string = "©2022 Jan Lerking"
|
||||||
STD_MESS string = "Ready"
|
STD_MESS string = "Ready"
|
||||||
LogFile string = "BeadImager.log"
|
LogFile string = "BeadImager.log"
|
||||||
|
|||||||
Reference in New Issue
Block a user