diff --git a/generateGui.go b/generateGui.go index 330ae7b..6c8121f 100644 --- a/generateGui.go +++ b/generateGui.go @@ -286,13 +286,10 @@ func guiStringFuncs(w io.Writer, ZOOPB string, FRUITS string, FRUIT string) { fmt.Fprintln(w, " r := new(guipb.StringCol)") fmt.Fprintln(w, " r.Header = new(guipb.Widget)") fmt.Fprintln(w, " r.Header.Name = name") - - /* - fmt.Fprintln(w, " all := mt.x.All()") - fmt.Fprintln(w, " for all.Scan() {") - fmt.Fprintln(w, " m := all.Next()") - */ - + fmt.Fprintln(w, " r.Attr = new(guipb.ColAttr)") + fmt.Fprintln(w, " r.Attr.Width = int32(sf.Width)") + fmt.Fprintln(w, " r.Attr.Type = guipb.ColAttr_STRING") + fmt.Fprintln(w, "") fmt.Fprintln(w, " for m := range mt.x.IterAll() {") fmt.Fprintln(w, " r.Vals = append(r.Vals, sf.f(m))") fmt.Fprintln(w, " // log.Info(\""+ZOOPB+": adding\", name, r.Vals)") @@ -312,6 +309,11 @@ func guiStringFuncs(w io.Writer, ZOOPB string, FRUITS string, FRUIT string) { fmt.Fprintln(w, " r := new(guipb.ButtonCol)") fmt.Fprintln(w, " r.Header = new(guipb.Widget)") fmt.Fprintln(w, " r.Header.Name = name") + fmt.Fprintln(w, " r.Attr = new(guipb.ColAttr)") + fmt.Fprintln(w, " r.Attr.Width = int32(sf.Width)") + fmt.Fprintln(w, " r.Attr.Type = guipb.ColAttr_STRING") + fmt.Fprintln(w, " r.Attr.Click = true") + fmt.Fprintln(w, "") fmt.Fprintln(w, " for m := range mt.x.IterAll() {") fmt.Fprintln(w, " r.Vals = append(r.Vals, sf.f(m))") fmt.Fprintln(w, " // log.Info(\""+ZOOPB+": adding\", name, r.Vals)") @@ -331,6 +333,10 @@ func guiStringFuncs(w io.Writer, ZOOPB string, FRUITS string, FRUIT string) { fmt.Fprintln(w, " r := new(guipb.IntCol)") fmt.Fprintln(w, " r.Header = new(guipb.Widget)") fmt.Fprintln(w, " r.Header.Name = name") + fmt.Fprintln(w, " r.Attr = new(guipb.ColAttr)") + fmt.Fprintln(w, " r.Attr.Width = int32(sf.Width)") + fmt.Fprintln(w, " r.Attr.Type = guipb.ColAttr_INT") + fmt.Fprintln(w, "") fmt.Fprintln(w, " for m := range mt.x.IterAll() {") fmt.Fprintln(w, " r.Vals = append(r.Vals, int64(sf.f(m)))") fmt.Fprintln(w, " // log.Info(\""+ZOOPB+": adding\", name, r.Vals)") @@ -350,6 +356,10 @@ func guiStringFuncs(w io.Writer, ZOOPB string, FRUITS string, FRUIT string) { fmt.Fprintln(w, " r := new(guipb.TimeCol)") fmt.Fprintln(w, " r.Header = new(guipb.Widget)") fmt.Fprintln(w, " r.Header.Name = name") + fmt.Fprintln(w, " r.Attr = new(guipb.ColAttr)") + fmt.Fprintln(w, " r.Attr.Width = int32(sf.Width)") + fmt.Fprintln(w, " r.Attr.Type = guipb.ColAttr_TIME") + fmt.Fprintln(w, "") fmt.Fprintln(w, " for m := range mt.x.IterAll() {") fmt.Fprintln(w, " t := sf.f(m)") fmt.Fprintln(w, " r.Vals = append(r.Vals, timestamppb.New(t)) // convert to protobuf time")