further renaming of core packages, especially of tree and imagex

emer · Apr 14, 2024 · 0bf32ed · 0bf32ed
1 parent 675eb2b
commit 0bf32ed
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 26 deletions.
diff --git a/egui/gui.go b/egui/gui.go
@@ -131,7 +131,7 @@ func (gui *GUI) FinalizeGUI(closePrompt bool) {
 				inQuitPrompt = true
 				core.PromptDialog(vp, core.DlgOpts{Title: "Really Quit?",
 					Prompt: "Are you <i>sure</i> you want to quit and lose any unsaved params, weights, logs, etc?"}, core.AddOk, core.AddCancel,
-					gui.Win.This(), func(recv, send tree.Ki, sig int64, data any) {
+					gui.Win.This(), func(recv, send tree.Node, sig int64, data any) {
 						if sig == int64(core.DialogAccepted) {
 							core.Quit()
 						} else {
@@ -148,7 +148,7 @@ func (gui *GUI) FinalizeGUI(closePrompt bool) {
 				inClosePrompt = true
 				core.PromptDialog(vp, core.DlgOpts{Title: "Really Close gui.Window?",
 					Prompt: "Are you <i>sure</i> you want to close the gui.Window?  This will Quit the App as well, losing all unsaved params, weights, logs, etc"}, core.AddOk, core.AddCancel,
-					gui.Win.This(), func(recv, send tree.Ki, sig int64, data any) {
+					gui.Win.This(), func(recv, send tree.Node, sig int64, data any) {
 						if sig == int64(core.DialogAccepted) {
 							core.Quit()
 						} else {

diff --git a/netview/events.go b/netview/events.go
@@ -12,13 +12,13 @@ import (
 	"cogentcore.org/core/math32"
 	"cogentcore.org/core/views"
 	"cogentcore.org/core/xyz"
-	"cogentcore.org/core/xyzv"
+	"cogentcore.org/core/xyzview"
 	"github.com/emer/emergent/v2/emer"
 )
 
 // Scene is a Widget for managing the 3D Scene of the NetView
 type Scene struct {
-	xyzv.Scene
+	xyzview.Scene
 
 	NetView *NetView
 }

diff --git a/netview/gtigen.go b/netview/gtigen.go
diff --git a/stepper/README.md b/stepper/README.md
@@ -121,7 +121,7 @@ and (optionally) `stepper.StopCheckFn` functions:
          Tooltip: "Stop the current program at its next natural stopping point (i.e., cleanly stopping when appropriate chunks of computation have completed).",
          UpdateFunc: func(act *core.Action) {
             act.SetActiveStateUpdate(ss.IsRunning)
-      }}, win.This(), func(recv, send tree.Ki, sig int64, data interface{}) {
+      }}, win.This(), func(recv, send tree.Node, sig int64, data interface{}) {
          fmt.Println("STOP!")
          ss.Stepper.Pause() // NOTE: call Pause here. Stop should only be called when starting over for a new run
          ss.IsRunning = false
@@ -131,7 +131,7 @@ and (optionally) `stepper.StopCheckFn` functions:
       tbar.AddAction(core.ActOpts{Label: "Cycle", Icon: "run", Tooltip: "Step to the end of a Cycle.",
          UpdateFunc: func(act *core.Action) {
             act.SetActiveStateUpdate(!ss.IsRunning)
-         }}, win.This(), func(recv, send tree.Ki, sig int64, data interface{}) {
+         }}, win.This(), func(recv, send tree.Node, sig int64, data interface{}) {
          ss.RunSteps(Cycle, tbar)
       })
       ...