rm old stuff finallyv0.22.39v0.22.38

1 files changed, 7 insertions, 111 deletions

diff --git a/table.go b/table.go
index 76e2f88..5cf7b6e 100644
--- a/table.go
+++ b/table.go
@@ -118,12 +118,12 @@ func (me *TreeInfo) updateTable(t *guipb.Table) {
 	me.Add(grid)
 	var h int = 0
 	var w int = 0
-	for _, name := range t.Order {
+	for _, col := range t.AnyCols {
 		// log.Info("got order:", t.Title, name)
-		if me.addTableCol(t, grid, name, w) {
+		if me.addTableCol(t, grid, col.Header.Name, w) {
 			// log.Info("tree:row() COLUMN GOOD", t.Title, name, w, h)
 		} else {
-			log.Info("tree:row() COLUMN FAIL", t.Title, name, w, h)
+			log.Info("tree:row() COLUMN FAIL", t.Title, col.Header.Name, w, h)
 		}
 
 		w += 1
@@ -213,12 +213,12 @@ func (me *TreeInfo) makeTable(t *guipb.Table) {
 	// log.Info("tree: makeTable() finished add win & grid")
 	var h int = 0
 	var w int = 0
-	for _, name := range t.Order {
+	for _, col := range t.AnyCols {
 		// log.Info("got order:", t.Title, name)
-		if me.addTableCol(t, grid, name, w) {
+		if me.addTableCol(t, grid, col.Header.Name, w) {
 			// log.Info("tree:row() COLUMN GOOD", t.Title, name, w, h)
 		} else {
-			log.Log(TREEWARN, "tree:row() COLUMN FAIL", t.Title, name, w, h)
+			log.Log(TREEWARN, "tree:row() COLUMN FAIL", t.Title, col.Header.Name, w, h)
 		}
 
 		w += 1
@@ -227,96 +227,6 @@ func (me *TreeInfo) makeTable(t *guipb.Table) {
 
 func (me *TreeInfo) addTableCol(t *guipb.Table, grid *Node, name string, w int) bool {
 	var h int = 0
-	for _, r := range t.StringCols {
-		if name != r.Header.Name {
-			// log.Info("skip string row:", r.Header.Name, "!=", name)
-			continue
-		}
-		// log.Info("tree: Add()ing to grid here", r.Header.Id, r.Header.Name, w, h)
-		head := grid.makeGridLabel(r.Header, w, h)
-		me.Add(head)
-		h += 1
-		for _, v := range r.Widgets {
-			// log.Info("tree: Add()ing to grid here", v.Id, v.Name, w, h)
-			lab := grid.makeGridLabel(v, w, h)
-			me.Add(lab)
-			h += 1
-		}
-		return true
-	}
-
-	for _, r := range t.ButtonCols {
-		if name != r.Header.Name {
-			// log.Info("skip string row:", r.Header.Name, "!=", name)
-			continue
-		}
-		// log.Info("tree: Add()ing to grid here", r.Header.Id, r.Header.Name, w, h)
-		head := grid.makeGridLabel(r.Header, w, h)
-		me.Add(head)
-		h += 1
-		for _, v := range r.Widgets {
-			// log.Info("tree: Add()ing to grid here", v.Id, v.Name, w, h)
-			lab := grid.makeGridButton(v, w, h)
-			me.Add(lab)
-			h += 1
-		}
-		return true
-	}
-
-	for _, r := range t.IntCols {
-		if name != r.Header.Name {
-			// log.Info("skip sint row:", r.Header.Name, "!=", name)
-			continue
-		}
-		// log.Info("tree: Add()ing to grid here", r.Header.Id, r.Header.Name, w, h)
-		head := grid.makeGridLabel(r.Header, w, h)
-		me.Add(head)
-		h += 1
-		for _, v := range r.Widgets {
-			vi, err := extractInt64(v.Val)
-			if err != nil {
-				log.Log(TREEWARN, "int error", err)
-			}
-			v.Name = fmt.Sprintf("%d", vi)
-			// log.Info("tree: Add()ing to grid here", v.Id, v.Name, w, h)
-			lab := grid.makeGridLabel(v, w, h)
-			me.Add(lab)
-			h += 1
-		}
-		return true
-	}
-
-	for _, r := range t.TimeCols {
-		if name != r.Header.Name {
-			// log.Info("skip sint row:", r.Header.Name, "!=", name)
-			continue
-		}
-		// log.Info("tree: Add()ing to grid here", r.Header.Id, r.Header.Name, w, h)
-		head := grid.makeGridLabel(r.Header, w, h)
-		me.Add(head)
-		h += 1
-		for _, widg := range r.Widgets {
-			msg, err := anypb.UnmarshalNew(widg.Val, proto.UnmarshalOptions{})
-			if err != nil {
-				log.Fatalf("failed to unmarshal: %v", err)
-			}
-
-			switch v := msg.(type) {
-			case *timestamppb.Timestamp:
-				// fmt.Println("Unpacked Timestamp:", shell.FormatDuration(time.Since(v.AsTime())))
-				widg.Name = shell.FormatDuration(time.Since(v.AsTime()))
-			default:
-				fmt.Println("Unknown type:", v)
-				widg.Name = fmt.Sprintf("%v", v)
-			}
-
-			// log.Info("tree: Add()ing to grid here", widg.Id, widg.Name, w, h)
-			lab := grid.makeGridLabel(widg, w, h)
-			me.Add(lab)
-			h += 1
-		}
-		return true
-	}
 
 	for _, col := range t.AnyCols {
 		if name != col.Header.Name {
@@ -431,21 +341,7 @@ func (n *Node) InTable() bool {
 }
 
 func dumpTable(t *guipb.Table) {
-	for i, o := range t.Order {
-		log.Info("got order:", t.Title, i, o)
-	}
-	for i, r := range t.StringCols {
-		log.Info("got string row:", t.Title, i, r.Header.Name, r.Vals)
-		for _, v := range r.Widgets {
-			log.Info("tree: got string widget:", v.Id, v.Name)
-		}
-	}
-	for i, r := range t.IntCols {
-		log.Info("got int row:", t.Title, i, r.Header.Name, r.Vals)
-		for _, v := range r.Widgets {
-			log.Info("tree: got int widget:", v.Id, v.Val)
-		}
-	}
+	// todo
 }
 
 type TreeTable struct {