toolkits
/
tree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

quiet table pb output

This commit is contained in:
Jeff Carr 2025-03-10 09:44:31 -05:00
parent 531a31e4b3
commit e640db7eb6
3 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
action.go
View File

@ -28,13 +28,13 @@ func (me *TreeInfo) doAction(a widget.Action) {
return return
} }
if a.TablePB != nil { if a.TablePB != nil {
log.Log(TREEWARN, "tree: got a TablePB") log.Log(TREE, "tree: got a TablePB")
me.doTable(a) me.doTable(a)
return return
} }
if a.WidgetId == 0 { if a.WidgetId == 0 {
if treeRoot == nil { if treeRoot == nil {
log.Log(TREEWARN, "tree.doAction() yes, treeRoot is nil. add here") log.Log(TREE, "tree.doAction() yes, treeRoot is nil. add here")
} }
} }
n := treeRoot.FindWidgetId(a.WidgetId) n := treeRoot.FindWidgetId(a.WidgetId)
@ -139,7 +139,6 @@ func (me *TreeInfo) doAction(a widget.Action) {
} else { } else {
me.Hide(n) me.Hide(n)
} }
log.Info("tree: todo: remove child from parent")
me.DeleteNode(n) me.DeleteNode(n)
// now remove the child from the parent // now remove the child from the parent
default: default:

12
addNode.go
View File

@ -60,23 +60,23 @@ func addNode(a *widget.Action) *Node {
} }
func (me *TreeInfo) DeleteNode(n *Node) { func (me *TreeInfo) DeleteNode(n *Node) {
log.Log(TREEWARN, "DeleteNode() before lock n =", n.WidgetId, n.GetProgName()) log.Log(TREE, "DeleteNode() before lock n =", n.WidgetId, n.GetProgName())
if me.TryLock() { if me.TryLock() {
defer me.Unlock() defer me.Unlock()
} else { } else {
log.Info("TREE: mutex lock was already held before DeleteNode()") log.Info("TREE: mutex lock was already held before DeleteNode()")
} }
p := n.Parent p := n.Parent
log.Log(TREEWARN, "DeleteNode() parent =", p.WidgetId, p.GetProgName()) log.Log(TREE, "DeleteNode() parent =", p.WidgetId, p.GetProgName())
for i, child := range p.children { for i, child := range p.children {
log.Log(TREEWARN, "parent has child:", i, child.WidgetId, child.GetProgName()) log.Log(TREE, "parent has child:", i, child.WidgetId, child.GetProgName())
if n == child { if n == child {
log.Log(TREEWARN, "Found child ==", i, child.WidgetId, child.GetProgName()) log.Log(TREE, "Found child ==", i, child.WidgetId, child.GetProgName())
log.Log(TREEWARN, "Found n ==", i, n.WidgetId, n.GetProgName()) log.Log(TREE, "Found n ==", i, n.WidgetId, n.GetProgName())
p.children = append(p.children[:i], p.children[i+1:]...) p.children = append(p.children[:i], p.children[i+1:]...)
} }
} }
for i, child := range p.children { for i, child := range p.children {
log.Log(TREEWARN, "parent now has child:", i, child.WidgetId, child.GetProgName()) log.Log(TREE, "parent now has child:", i, child.WidgetId, child.GetProgName())
} }
} }

20
table.go
View File

@ -40,19 +40,19 @@ func (me *TreeInfo) doTable(a widget.Action) {
for i, ot := range me.currentTables { for i, ot := range me.currentTables {
// log.Info("TREE already has UUID", i, ot.Uuid) // log.Info("TREE already has UUID", i, ot.Uuid)
if t.Uuid == ot.Uuid { if t.Uuid == ot.Uuid {
log.Info("TREE found UUID! update table here", i, ot.Uuid) log.Log(TREE, "TREE found UUID! update table here", i, ot.Uuid)
if ot.Grid == nil { if ot.Grid == nil {
log.Info("TREE found UUID! ot.grid.Id = nil. need to find grid id here") log.Log(TREE, "TREE found UUID! ot.grid.Id = nil. need to find grid id here")
return return
} else { } else {
log.Info("TREE found UUID! grid.Id =", ot.Grid.Id) log.Log(TREE, "TREE found UUID! grid.Id =", ot.Grid.Id)
t.Grid = ot.Grid t.Grid = ot.Grid
} }
if t.Grid == nil { if t.Grid == nil {
log.Info("TREE found UUID! grid.Id = nil. need to find grid id here") log.Log(TREE, "TREE found UUID! grid.Id = nil. need to find grid id here")
return return
} }
log.Info("TREE found UUID! update table here", i, ot.Uuid, "grid.Id =", t.Grid.Id) log.Log(TREE, "TREE found UUID! update table here", i, ot.Uuid, "grid.Id =", t.Grid.Id)
me.updateTable(t) me.updateTable(t)
return return
} }
@ -60,9 +60,9 @@ func (me *TreeInfo) doTable(a widget.Action) {
me.currentTables = append(me.currentTables, t) me.currentTables = append(me.currentTables, t)
if t.Grid == nil { if t.Grid == nil {
log.Info("NEW TREE ERROR: grid.Id = nil need to set grid id here") log.Log(TREEWARN, "new table error: grid.Id = nil need to set grid id here")
} else { } else {
log.Info("NEW TREE: grid.Id =", t.Grid.Id) // log.Info("NEW TREE: grid.Id =", t.Grid.Id)
} }
me.makeTable(t) me.makeTable(t)
} }
@ -198,11 +198,11 @@ func (me *TreeInfo) makeTable(t *guipb.Table) {
grid = addNode(a) grid = addNode(a)
} }
if grid == nil { if grid == nil {
log.Info("tree: makeTable() failed to make grid") log.Log(TREEWARN, "tree: makeTable() failed to make grid")
return return
} }
me.Add(grid) me.Add(grid)
log.Info("tree: makeTable() finished add win & grid") // log.Info("tree: makeTable() finished add win & grid")
var h int = 0 var h int = 0
var w int = 0 var w int = 0
for _, name := range t.Order { for _, name := range t.Order {
@ -210,7 +210,7 @@ func (me *TreeInfo) makeTable(t *guipb.Table) {
if me.addTableRow(t, grid, name, w) { if me.addTableRow(t, grid, name, w) {
// log.Info("tree:row() COLUMN GOOD", t.Title, name, w, h) // log.Info("tree:row() COLUMN GOOD", t.Title, name, w, h)
} else { } else {
log.Info("tree:row() COLOMN FAIL", t.Title, name, w, h) log.Log(TREEWARN, "tree:row() COLOMN FAIL", t.Title, name, w, h)
} }
w += 1 w += 1