string rows

1 files changed, 53 insertions, 19 deletions

diff --git a/table.go b/table.go
index 35d64c9..35d490a 100644
--- a/table.go
+++ b/table.go
@@ -74,16 +74,12 @@ type NodeTable struct {
 	// pb *guipb.Table
 }
 
-func (t *NodeTable) ShowTable(pb *guipb.Table) {
-	log.Info("gui.ShowTable")
+func ShowTable(pb *guipb.Table) {
 	// make a new action and populate the current node state
-	a := getNewAction(t.n, widget.Show)
-	/*
-		if t.pb == nil {
-			log.Info("error: TablePB == nil")
-			return
-		}
-	*/
+	a := getNewAction(me.rootNode, widget.Show)
+
+	makeTableWidgets(pb)
+
 	nt := guipb.NewTables()
 	nt.Append(pb)
 	a.TablePB, err = nt.Marshal()
@@ -91,17 +87,55 @@ func (t *NodeTable) ShowTable(pb *guipb.Table) {
 		log.Info("unmarshal error", err)
 		return
 	}
-	log.Info("send action to plugin", t.n.label, "pb len =", len(a.TablePB))
+	log.Info("send action to plugin", "pb len =", len(a.TablePB))
 	sendActionToPlugin(a)
 
-	/*
-		newNode := parent.newNode(name, widget.Button)
-		newNode.Custom = custom
-		newNode.label = name
-		newNode.progname = name
+}
 
-		// inform the toolkits
-		sendAction(newNode, widget.Add)
-	*/
-	// return newNode
+func makeTableWidgets(pb *guipb.Table) {
+	if pb == nil {
+		log.Info("pb was nil")
+		return
+	}
+	if me.rootNode == nil {
+		log.Info("me.rootNode was nil")
+		return
+	}
+	win := addNode()
+	pb.Window = new(guipb.Widget)
+	pb.Window.Id = int64(win.id)
+	pb.Window.Name = pb.Title
+
+	grid := addNode()
+	pb.Grid = new(guipb.Widget)
+	pb.Grid.Id = int64(grid.id)
+	for i, r := range pb.StringRows {
+		log.Info("gui: got string row:", pb.Title, i, r.Header, r.Vals)
+		for _, v := range r.Vals {
+			label := addNode()
+			pbwidget := new(guipb.Widget)
+			pbwidget.Id = int64(label.id)
+			pbwidget.Name = v
+			r.WidgetS = append(r.WidgetS, pbwidget)
+			log.Info("gui: added new WidgetS", pbwidget)
+		}
+	}
+	for i, r := range pb.IntRows {
+		log.Info("gui: got int row:", i, r.Header, r.Vals)
+	}
 }
+
+/*
+func (t *NodeTable) ShowTable(pb *guipb.Table) {
+	log.Info("gui.ShowTable")
+	// make a new action and populate the current node state
+	a := getNewAction(t.n, widget.Show)
+	a.TablePB, err = nt.Marshal()
+	if err != nil {
+		log.Info("unmarshal error", err)
+		return
+	}
+	log.Info("send action to plugin", t.n.label, "pb len =", len(a.TablePB))
+	sendActionToPlugin(a)
+}
+*/