rm deprecated thingsv0.25.4

1 files changed, 0 insertions, 235 deletions

diff --git a/table.go b/table.go
index 665ec90..c71e540 100644
--- a/table.go
+++ b/table.go
@@ -10,7 +10,6 @@ import (
 	"go.wit.com/log"
 	"go.wit.com/widget"
 	"google.golang.org/protobuf/types/known/anypb"
-	"google.golang.org/protobuf/types/known/wrapperspb"
 )
 
 func (n *Node) findInTablePB(pb *guipb.Table, id int) *guipb.Widget {
@@ -18,58 +17,6 @@ func (n *Node) findInTablePB(pb *guipb.Table, id int) *guipb.Widget {
 		log.Info("SOMETHING WAS WRONG. gui.findInTablePB() n.tablepb == nil for widget id", id)
 		return nil
 	}
-	for _, r := range pb.StringCols {
-		if r.Header.Id == int64(id) {
-			log.Info("gui.findInTablePB() found widget", r.Header)
-			return r.Header
-		}
-		for _, w := range r.Widgets {
-			if w.Id == int64(id) {
-				log.Info("gui.findInTablePB() found widget", w)
-				return w
-			}
-		}
-	}
-
-	for _, r := range pb.ButtonCols {
-		if r.Header.Id == int64(id) {
-			log.Info("gui.findInTablePB() found widget", r.Header)
-			return r.Header
-		}
-		for _, w := range r.Widgets {
-			// log.Info("gui.findInTablePB() checking widget", w)
-			if w.Id == int64(id) {
-				log.Info("gui.findInTablePB() found widget", w)
-				return w
-			}
-		}
-	}
-
-	for _, r := range pb.IntCols {
-		if r.Header.Id == int64(id) {
-			log.Info("gui.findInTablePB() found widget", r.Header)
-			return r.Header
-		}
-		for _, w := range r.Widgets {
-			if w.Id == int64(id) {
-				log.Info("gui.findInTablePB() found widget", w)
-				return w
-			}
-		}
-	}
-
-	for _, r := range pb.TimeCols {
-		if r.Header.Id == int64(id) {
-			log.Info("gui.findInTablePB() found widget", r.Header)
-			return r.Header
-		}
-		for _, w := range r.Widgets {
-			if w.Id == int64(id) {
-				log.Info("gui.findInTablePB() found widget", w)
-				return w
-			}
-		}
-	}
 	log.Info("SOMETHING WAS WRONG. gui.findInTablePB() didn't find widget id", id)
 	return nil
 }
@@ -99,7 +46,6 @@ func (parent *Node) ShowTable(pb *guipb.Table) {
 	pb.Parent.Name = pb.Title
 
 	grid := parent.makeTableGrid(pb) // generates the protobuf table
-	parent.numberTableGrid(pb)       // sets the X,Y locations in the table protobuf grid
 	grid.tablepb = pb
 
 	nt := guipb.NewTables()
@@ -141,103 +87,8 @@ func (parent *Node) DeleteTable(pb *guipb.Table) {
 	sendActionToPlugin(a)
 }
 
-func (parent *Node) numberTableGrid(pb *guipb.Table) {
-	var h int = 0
-	var w int = 0
-	for _, name := range pb.Order {
-		// log.Info("got order:", t.Title, name)
-		if parent.numberTableCol(pb, name, w) {
-			// log.Info("tree:row() COLUMN GOOD", t.Title, name, w, h)
-		} else {
-			log.Info("tree:row() COLUMN FAIL", pb.Title, name, w, h)
-		}
-
-		w += 1
-	}
-}
-
 func (parent *Node) numberTableCol(pb *guipb.Table, name string, w int) bool {
 	var h int = 0
-	for _, r := range pb.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)
-		r.Header.Location = new(guipb.Location)
-		r.Header.Location.X = int64(w)
-		r.Header.Location.Y = int64(h)
-		h += 1
-		for _, v := range r.Widgets {
-			// log.Info("tree: Add()ing to grid here", v.Id, v.Name, w, h)
-			v.Location = new(guipb.Location)
-			v.Location.X = int64(w)
-			v.Location.Y = int64(h)
-			h += 1
-		}
-		return true
-	}
-
-	for _, r := range pb.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)
-		r.Header.Location = new(guipb.Location)
-		r.Header.Location.X = int64(w)
-		r.Header.Location.Y = int64(h)
-		h += 1
-		for _, v := range r.Widgets {
-			// log.Info("tree: Add()ing to grid here", v.Id, v.Name, w, h)
-			v.Location = new(guipb.Location)
-			v.Location.X = int64(w)
-			v.Location.Y = int64(h)
-			h += 1
-		}
-		return true
-	}
-
-	for _, r := range pb.IntCols {
-		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)
-		r.Header.Location = new(guipb.Location)
-		r.Header.Location.X = int64(w)
-		r.Header.Location.Y = int64(h)
-		h += 1
-		for _, v := range r.Widgets {
-			// log.Info("tree: Add()ing to grid here", v.Id, v.Name, w, h)
-			v.Location = new(guipb.Location)
-			v.Location.X = int64(w)
-			v.Location.Y = int64(h)
-			h += 1
-		}
-		return true
-	}
-
-	for _, r := range pb.TimeCols {
-		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)
-		r.Header.Location = new(guipb.Location)
-		r.Header.Location.X = int64(w)
-		r.Header.Location.Y = int64(h)
-		h += 1
-		for _, v := range r.Widgets {
-			// log.Info("tree: Add()ing to grid here", v.Id, v.Name, w, h)
-			v.Location = new(guipb.Location)
-			v.Location.X = int64(w)
-			v.Location.Y = int64(h)
-			h += 1
-		}
-		return true
-	}
-
 	for _, r := range pb.AnyCols {
 		if name != r.Header.Name {
 			// log.Info("skip string row:", r.Header.Name, "!=", name)
@@ -273,92 +124,6 @@ func (parent *Node) makeTableGrid(pb *guipb.Table) *Node {
 	parent.children = append(parent.children, grid)
 	grid.parent = parent
 
-	for _, r := range pb.StringCols {
-		// log.Info("gui: got string row:", pb.Title, i, r.Header, r.Vals)
-		header := addNode()
-		r.Header.Id = int64(header.id)
-		for _, v := range r.Vals {
-			label := addNode()
-			label.WidgetType = widget.Label
-			label.parent = grid
-			label.enabled = true
-			grid.children = append(grid.children, label)
-
-			pbwidget := new(guipb.Widget)
-			pbwidget.Id = int64(label.id)
-			pbwidget.Name = v
-			r.Widgets = append(r.Widgets, pbwidget)
-			// log.Info("gui: added new string", pbwidget)
-		}
-	}
-
-	for _, r := range pb.ButtonCols {
-		// log.Info("gui: got string row:", pb.Title, i, r.Header, r.Vals)
-		header := addNode()
-		r.Header.Id = int64(header.id)
-		for _, v := range r.Vals {
-			label := addNode()
-			label.WidgetType = widget.Button
-			label.parent = grid
-			label.enabled = true
-			grid.children = append(grid.children, label)
-
-			pbwidget := new(guipb.Widget)
-			pbwidget.Id = int64(label.id)
-			pbwidget.Name = v
-			r.Widgets = append(r.Widgets, pbwidget)
-			// log.Info("gui: added new string", pbwidget)
-		}
-	}
-
-	for _, r := range pb.IntCols {
-		// log.Info("gui: got int row:", i, r.Header, r.Vals)
-		header := addNode()
-		r.Header.Id = int64(header.id)
-		for _, v := range r.Vals {
-			label := addNode()
-			label.WidgetType = widget.Label
-			label.parent = grid
-			label.enabled = true
-			grid.children = append(grid.children, label)
-
-			pbwidget := new(guipb.Widget)
-			pbwidget.Id = int64(label.id)
-			anyValue, err := anypb.New(wrapperspb.Int64(v))
-			if err != nil {
-				log.Info("gui: failed to add time", err)
-				continue
-			}
-			pbwidget.Val = anyValue
-			r.Widgets = append(r.Widgets, pbwidget)
-			// log.Info("gui: added new int", pbwidget)
-		}
-	}
-
-	for _, r := range pb.TimeCols {
-		// log.Info("gui: got time row:", i, r.Header, r.Vals)
-		header := addNode()
-		r.Header.Id = int64(header.id)
-		for _, v := range r.Vals {
-			label := addNode()
-			label.WidgetType = widget.Label
-			label.parent = grid
-			label.enabled = true
-			grid.children = append(grid.children, label)
-
-			pbwidget := new(guipb.Widget)
-			pbwidget.Id = int64(label.id)
-			anyValue, err := anypb.New(v)
-			if err != nil {
-				log.Info("gui: failed to add time", err)
-				continue
-			}
-			pbwidget.Val = anyValue
-			r.Widgets = append(r.Widgets, pbwidget)
-			// log.Info("gui: added new val", pbwidget)
-		}
-	}
-
 	for _, r := range pb.AnyCols {
 		// log.Info("gui: got time row:", i, r.Header, r.Vals)
 		header := addNode()