more latest core updates

emer · Jun 15, 2024 · eb8a6a7 · eb8a6a7
1 parent 96b5da7
commit eb8a6a7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/egui/gui.go b/egui/gui.go
@@ -10,9 +10,9 @@ import (
 	"cogentcore.org/core/core"
 	"cogentcore.org/core/plot/plotcore"
 	"cogentcore.org/core/tensor/tensorcore"
+	_ "cogentcore.org/core/vgpu/gosl/slbool/slboolcore" // include to get gui views
 	"github.com/emer/emergent/v2/etime"
 	"github.com/emer/emergent/v2/netview"
-	// _ "cogentcore.org/core/vgpu/gosl/slboolview" // include to get gui views
 )
 
 // GUI manages all standard elements of a simulation Graphical User Interface

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/emer/emergent/v2
 go 1.22
 
 require (
-	cogentcore.org/core v0.1.3-0.20240503210706-71d86d6e6877
+	cogentcore.org/core v0.1.5-0.20240614235343-22f64ec2583a
 	github.com/BurntSushi/toml v1.3.2
 	github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883
 	github.com/iancoleman/strcase v0.3.0

diff --git a/go.sum b/go.sum
@@ -1,5 +1,5 @@
-cogentcore.org/core v0.1.3-0.20240503210706-71d86d6e6877 h1:asDIlNiuD4f3h4xkxfs9h2gj0h3cUlOtdRijLW/SXh0=
-cogentcore.org/core v0.1.3-0.20240503210706-71d86d6e6877/go.mod h1:lZ5rM70S7cJtrly4skCan+9fk5NFlKeSnIQBtz5fRQA=
+cogentcore.org/core v0.1.5-0.20240614235343-22f64ec2583a h1:aHJEDfStMYHoaWe1F7K/t009hxze3sIWIxfYH4tZY+s=
+cogentcore.org/core v0.1.5-0.20240614235343-22f64ec2583a/go.mod h1:o477M2AoxLk2ayvQgNiN1eCkXPn0cZuY7JJgX+cxoa0=
 github.com/Bios-Marcel/wastebasket v0.0.4-0.20240213135800-f26f1ae0a7c4 h1:6lx9xzJAhdjq0LvVfbITeC3IH9Fzvo1aBahyPu2FuG8=
 github.com/Bios-Marcel/wastebasket v0.0.4-0.20240213135800-f26f1ae0a7c4/go.mod h1:FChzXi1izqzdPb6BiNZmcZLGyTYiT61iGx9Rxx9GNeI=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=

diff --git a/netview/netview.go b/netview/netview.go
@@ -881,28 +881,28 @@ func (nv *NetView) MakeToolbar(p *core.Plan) {
 	core.Add(p, func(w *core.Separator) {})
 	core.Add(p, func(w *core.Button) {
 		w.SetText("Weights").SetType(core.ButtonAction).SetMenu(func(m *core.Scene) {
-			fb := core.NewFuncButton(m, nv.SaveWeights)
+			fb := core.NewFuncButton(m).SetFunc(nv.SaveWeights)
 			fb.SetIcon(icons.Save)
 			fb.Args[0].SetTag(`"ext:".wts,.wts.gz"`)
-			fb = core.NewFuncButton(m, nv.OpenWeights)
+			fb = core.NewFuncButton(m).SetFunc(nv.OpenWeights)
 			fb.SetIcon(icons.Open)
 			fb.Args[0].SetTag(`"ext:".wts,.wts.gz"`)
 		})
 	})
 	core.Add(p, func(w *core.Button) {
 		w.SetText("Params").SetIcon(icons.Info).SetMenu(func(m *core.Scene) {
-			core.NewFuncButton(m, nv.ShowNonDefaultParams).SetIcon(icons.Info)
-			core.NewFuncButton(m, nv.ShowAllParams).SetIcon(icons.Info)
-			core.NewFuncButton(m, nv.ShowKeyLayerParams).SetIcon(icons.Info)
-			core.NewFuncButton(m, nv.ShowKeyPathParams).SetIcon(icons.Info)
+			core.NewFuncButton(m).SetFunc(nv.ShowNonDefaultParams).SetIcon(icons.Info)
+			core.NewFuncButton(m).SetFunc(nv.ShowAllParams).SetIcon(icons.Info)
+			core.NewFuncButton(m).SetFunc(nv.ShowKeyLayerParams).SetIcon(icons.Info)
+			core.NewFuncButton(m).SetFunc(nv.ShowKeyPathParams).SetIcon(icons.Info)
 		})
 	})
 	core.Add(p, func(w *core.Button) {
 		w.SetText("Net Data").SetIcon(icons.Save).SetMenu(func(m *core.Scene) {
-			core.NewFuncButton(m, nv.Data.SaveJSON).SetText("Save Net Data").SetIcon(icons.Save)
-			core.NewFuncButton(m, nv.Data.OpenJSON).SetText("Open Net Data").SetIcon(icons.Open)
+			core.NewFuncButton(m).SetFunc(nv.Data.SaveJSON).SetText("Save Net Data").SetIcon(icons.Save)
+			core.NewFuncButton(m).SetFunc(nv.Data.OpenJSON).SetText("Open Net Data").SetIcon(icons.Open)
 			core.NewSeparator(m)
-			core.NewFuncButton(m, nv.PlotSelectedUnit).SetIcon(icons.Open)
+			core.NewFuncButton(m).SetFunc(nv.PlotSelectedUnit).SetIcon(icons.Open)
 		})
 	})
 	core.Add(p, func(w *core.Separator) {})