diff options
Diffstat (limited to 'generateGui.go')
| -rw-r--r-- | generateGui.go | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/generateGui.go b/generateGui.go index 86d6179..f1ba384 100644 --- a/generateGui.go +++ b/generateGui.go @@ -282,9 +282,14 @@ func guiStringFuncs(w io.Writer, ZOOPB string, FRUITS string, FRUIT string) { fmt.Fprintln(w, " r := new(guipb.StringRow)") 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, " all := mt.x.All()") + fmt.Fprintln(w, " for all.Scan() {") + fmt.Fprintln(w, " m := all.Next()") + */ + + 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)") fmt.Fprintln(w, " }") @@ -303,9 +308,7 @@ func guiStringFuncs(w io.Writer, ZOOPB string, FRUITS string, FRUIT string) { fmt.Fprintln(w, " r := new(guipb.ButtonRow)") 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, " 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)") fmt.Fprintln(w, " }") @@ -324,9 +327,7 @@ func guiStringFuncs(w io.Writer, ZOOPB string, FRUITS string, FRUIT string) { fmt.Fprintln(w, " r := new(guipb.IntRow)") 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, " 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)") fmt.Fprintln(w, " }") @@ -345,9 +346,7 @@ func guiStringFuncs(w io.Writer, ZOOPB string, FRUITS string, FRUIT string) { fmt.Fprintln(w, " r := new(guipb.TimeRow)") 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, " 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") fmt.Fprintln(w, " // log.Info(\""+ZOOPB+": adding\", name, r.Vals)") |