diff options
Diffstat (limited to 'tablePB.go')
| -rw-r--r-- | tablePB.go | 33 |
1 files changed, 20 insertions, 13 deletions
@@ -23,23 +23,30 @@ func PrintTable(pb *guipb.Table) { log.Info("grid.Id =", pb.Grid.Id) } - if pb.Height < 4 { - pb.Height = 4 - } var h int = 0 var w int = 0 + var HEIGHT int + if pb.Height == 0 { + HEIGHT = 4 + } + log.Info("pb.Height", pb.Height, HEIGHT) var args []string var sizes []int for _, name := range pb.Order { - arg, attr := getColAttr(pb, name) + arg, attr, tmp := getColAttr(pb, name) + HEIGHT = tmp args = append(args, arg) - sizes = append(sizes, int(attr.Width)) + if attr.Width == 0 { + sizes = append(sizes, 8) + } else { + sizes = append(sizes, int(attr.Width)) + } } - sizes = []int{24, 5, 8, 32, 13, 4, 4, 4, 4} + // sizes = []int{24, 5, 8, 32, 13, 4, 4, 4, 4} header, _ := StandardTableRow(sizes, args) log.Info(header) - for i := range pb.Height { + for i := range HEIGHT { var cells []string for _, name := range pb.Order { if val, ok := getTableCell(pb, name, int(i)); ok { @@ -108,34 +115,34 @@ func getTableCell(t *guipb.Table, name string, row int) (string, bool) { return "", false } -func getColAttr(t *guipb.Table, name string) (string, *guipb.ColAttr) { +func getColAttr(t *guipb.Table, name string) (string, *guipb.ColAttr, int) { // find the Column that matches the "name" for _, r := range t.StringCols { if name != r.Header.Name { continue } - return r.Header.Name, r.Attr + return r.Header.Name, r.Attr, len(r.Vals) } for _, r := range t.ButtonCols { if name != r.Header.Name { // log.Info("skip string row:", r.Header.Name, "!=", name) continue } - return r.Header.Name, r.Attr + return r.Header.Name, r.Attr, len(r.Vals) } for _, r := range t.IntCols { if name != r.Header.Name { // log.Info("skip string row:", r.Header.Name, "!=", name) continue } - return r.Header.Name, r.Attr + return r.Header.Name, r.Attr, len(r.Vals) } for _, r := range t.TimeCols { if name != r.Header.Name { // log.Info("skip sint row:", r.Header.Name, "!=", name) continue } - return r.Header.Name, r.Attr + return r.Header.Name, r.Attr, len(r.Vals) } - return "", nil + return "", nil, 0 } |