0.2.1 Updated pegboard lists. /JL
This commit is contained in:
@@ -9,6 +9,7 @@ import (
|
|||||||
|
|
||||||
type (
|
type (
|
||||||
BeadColor struct {
|
BeadColor struct {
|
||||||
|
Color *walk.Composite
|
||||||
Checkbox *walk.CheckBox
|
Checkbox *walk.CheckBox
|
||||||
backgroundColor walk.Brush
|
backgroundColor walk.Brush
|
||||||
InfoTooltip *walk.ToolTip
|
InfoTooltip *walk.ToolTip
|
||||||
@@ -98,6 +99,7 @@ func NewBeadColor(mw *MyMainWindow, name string, id int, onhand int, red byte, g
|
|||||||
hb.SetMargins(walk.Margins{5, 0, 20, 0})
|
hb.SetMargins(walk.Margins{5, 0, 20, 0})
|
||||||
cm.SetLayout(hb)
|
cm.SetLayout(hb)
|
||||||
color := new(BeadColor)
|
color := new(BeadColor)
|
||||||
|
color.Color = cm
|
||||||
log.Println("Bead color struct: ", color)
|
log.Println("Bead color struct: ", color)
|
||||||
color.SetBackgroundColor(walk.RGB(red, green, blue))
|
color.SetBackgroundColor(walk.RGB(red, green, blue))
|
||||||
color.onHand = onhand
|
color.onHand = onhand
|
||||||
|
|||||||
@@ -24,13 +24,13 @@ type MyMainWindow struct {
|
|||||||
serie_combo *walk.ComboBox
|
serie_combo *walk.ComboBox
|
||||||
serie_model []string
|
serie_model []string
|
||||||
pegboard_combo *walk.ComboBox
|
pegboard_combo *walk.ComboBox
|
||||||
pegboard_model []string
|
Pegboards *Pegboards
|
||||||
properties *properties
|
properties *properties
|
||||||
}
|
}
|
||||||
|
|
||||||
const (
|
const (
|
||||||
AppName string = "BeadImager"
|
AppName string = "BeadImager"
|
||||||
Version string = "0.2.0"
|
Version string = "0.2.1"
|
||||||
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"
|
||||||
|
|||||||
+42
-12
@@ -53,13 +53,24 @@ type (
|
|||||||
InStock bool `xml:"inStock"`
|
InStock bool `xml:"inStock"`
|
||||||
OnHand int `xml:"onHand"`
|
OnHand int `xml:"onHand"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Pegboards struct {
|
||||||
|
Boards []Pegboard
|
||||||
|
}
|
||||||
|
|
||||||
|
Pegboard struct {
|
||||||
|
brand string
|
||||||
|
serie string
|
||||||
|
model []string
|
||||||
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
serie_triggered bool = false
|
Serie_triggered bool = false
|
||||||
)
|
)
|
||||||
|
|
||||||
func CreatePalletteGroup(mw *MyMainWindow) *walk.GroupBox {
|
func CreatePalletteGroup(mw *MyMainWindow) *walk.GroupBox {
|
||||||
|
mw.Pegboards = new(Pegboards)
|
||||||
mw.leftPanel, _ = walk.NewComposite(mw.content)
|
mw.leftPanel, _ = walk.NewComposite(mw.content)
|
||||||
vb := walk.NewVBoxLayout()
|
vb := walk.NewVBoxLayout()
|
||||||
mw.leftPanel.SetLayout(vb)
|
mw.leftPanel.SetLayout(vb)
|
||||||
@@ -87,10 +98,20 @@ func CreatePalletteGroup(mw *MyMainWindow) *walk.GroupBox {
|
|||||||
mw.serie_combo.SetModel(CreateSeriesList(mw))
|
mw.serie_combo.SetModel(CreateSeriesList(mw))
|
||||||
mw.serie_combo.SetText(ConfigSerie)
|
mw.serie_combo.SetText(ConfigSerie)
|
||||||
mw.serie_combo.CurrentIndexChanged().Attach(func() {
|
mw.serie_combo.CurrentIndexChanged().Attach(func() {
|
||||||
if !serie_triggered {
|
if !Serie_triggered {
|
||||||
mw.colors.Children().Clear()
|
for _, color := range mw.beads {
|
||||||
LoadBeads(mw)
|
if color.Series != mw.serie_combo.Text() {
|
||||||
serie_triggered = true
|
color.Color.SetVisible(false)
|
||||||
|
} else {
|
||||||
|
color.Color.SetVisible(true)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, model := range mw.Pegboards.Boards {
|
||||||
|
if model.brand == mw.brand_combo.Text() && model.serie == mw.serie_combo.Text() {
|
||||||
|
mw.pegboard_combo.SetModel(model.model)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Serie_triggered = true
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
comp, _ = walk.NewComposite(pallette_group)
|
comp, _ = walk.NewComposite(pallette_group)
|
||||||
@@ -99,23 +120,32 @@ func CreatePalletteGroup(mw *MyMainWindow) *walk.GroupBox {
|
|||||||
lbl, _ = walk.NewLabel(comp)
|
lbl, _ = walk.NewLabel(comp)
|
||||||
lbl.SetText("Pegboard:")
|
lbl.SetText("Pegboard:")
|
||||||
mw.pegboard_combo, _ = walk.NewComboBox(comp)
|
mw.pegboard_combo, _ = walk.NewComboBox(comp)
|
||||||
mw.pegboard_combo.SetModel(CreatePegboardsList(mw))
|
CreatePegboardsList(mw)
|
||||||
|
for _, model := range mw.Pegboards.Boards {
|
||||||
|
if model.brand == mw.brand_combo.Text() && model.serie == mw.serie_combo.Text() {
|
||||||
|
mw.pegboard_combo.SetModel(model.model)
|
||||||
|
}
|
||||||
|
}
|
||||||
mw.pegboard_combo.SetText(ConfigPegboard)
|
mw.pegboard_combo.SetText(ConfigPegboard)
|
||||||
return pallette_group
|
return pallette_group
|
||||||
}
|
}
|
||||||
|
|
||||||
func CreatePegboardsList(mw *MyMainWindow) []string {
|
func CreatePegboardsList(mw *MyMainWindow) {
|
||||||
pegboards := make([]string, 0)
|
var pb *Pegboard
|
||||||
for _, brand := range mw.pallette.Brand {
|
for _, brand := range mw.pallette.Brand {
|
||||||
if brand.BrandName == mw.brand_combo.Text() {
|
for _, serie := range brand.Series {
|
||||||
|
pb = new(Pegboard)
|
||||||
|
pb.brand = brand.BrandName
|
||||||
|
pb.serie = serie.Serie
|
||||||
for _, pegboard := range brand.Pegboards {
|
for _, pegboard := range brand.Pegboards {
|
||||||
if pegboard.Serie == mw.serie_combo.Text() {
|
if pegboard.Serie == pb.serie {
|
||||||
pegboards = append(pegboards, pegboard.Type)
|
pb.model = append(pb.model, pegboard.Type)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
mw.Pegboards.Boards = append(mw.Pegboards.Boards, *pb)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return pegboards
|
log.Println("Pegboard: ", mw.Pegboards)
|
||||||
}
|
}
|
||||||
|
|
||||||
func CreateSeriesList(mw *MyMainWindow) []string {
|
func CreateSeriesList(mw *MyMainWindow) []string {
|
||||||
|
|||||||
Reference in New Issue
Block a user