From 7ee13fe9143b34280b12af28efc52602b9482fb8 Mon Sep 17 00:00:00 2001 From: vicanso Date: Fri, 3 Jun 2022 21:06:40 +0800 Subject: [PATCH] chore: supper grid renderer --- alias.go | 1 - charts.go | 27 ++++++++++++++ examples/painter/main.go | 13 +++++++ grid.go | 80 ++++++++++++++++++++++++++++++++++++++++ painter.go | 2 +- 5 files changed, 121 insertions(+), 2 deletions(-) create mode 100644 charts.go create mode 100644 grid.go diff --git a/alias.go b/alias.go index d19c1f9..0b161e6 100644 --- a/alias.go +++ b/alias.go @@ -28,7 +28,6 @@ import ( ) type Box = chart.Box -type Renderer = chart.Renderer type Style = chart.Style type Color = drawing.Color diff --git a/charts.go b/charts.go new file mode 100644 index 0000000..445dd7e --- /dev/null +++ b/charts.go @@ -0,0 +1,27 @@ +// MIT License + +// Copyright (c) 2022 Tree Xie + +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: + +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. + +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. + +package charts + +type Renderer interface { + Render() (Box, error) +} diff --git a/examples/painter/main.go b/examples/painter/main.go index 8b0a157..4614f10 100644 --- a/examples/painter/main.go +++ b/examples/painter/main.go @@ -409,6 +409,19 @@ func main() { Bottom: 20, }) + top += 50 + charts.NewGridPainter(p.Child(charts.PainterBoxOption(charts.Box{ + Top: top, + Left: 1, + Right: p.Width() - 1, + Bottom: top + 100, + })), charts.GridPainterOption{ + Row: 5, + IgnoreFirstRow: true, + IgnoreLastRow: true, + StrokeColor: drawing.ColorBlue, + }).Render() + buf, err := p.Bytes() if err != nil { panic(err) diff --git a/grid.go b/grid.go new file mode 100644 index 0000000..1a00381 --- /dev/null +++ b/grid.go @@ -0,0 +1,80 @@ +// MIT License + +// Copyright (c) 2022 Tree Xie + +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: + +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. + +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. + +package charts + +type GridPainter struct { + p *Painter + opt *GridPainterOption +} + +type GridPainterOption struct { + StrokeWidth float64 + StrokeColor Color + Column int + Row int + IgnoreFirstRow bool + IgnoreLastRow bool + IgnoreFirstColumn bool + IgnoreLastColumn bool +} + +func NewGridPainter(p *Painter, opt GridPainterOption) *GridPainter { + return &GridPainter{ + p: p, + opt: &opt, + } +} + +func (g *GridPainter) Render() (Box, error) { + opt := g.opt + ignoreColumnLines := make([]int, 0) + if opt.IgnoreFirstColumn { + ignoreColumnLines = append(ignoreColumnLines, 0) + } + if opt.IgnoreLastColumn { + ignoreColumnLines = append(ignoreColumnLines, opt.Column) + } + ignoreRowLines := make([]int, 0) + if opt.IgnoreFirstRow { + ignoreRowLines = append(ignoreRowLines, 0) + } + if opt.IgnoreLastRow { + ignoreRowLines = append(ignoreRowLines, opt.Row) + } + strokeWidth := opt.StrokeWidth + if strokeWidth <= 0 { + strokeWidth = 1 + } + + g.p.SetDrawingStyle(Style{ + StrokeWidth: strokeWidth, + StrokeColor: opt.StrokeColor, + }) + g.p.Grid(GridOption{ + Column: opt.Column, + Row: opt.Row, + IgnoreColumnLines: ignoreColumnLines, + IgnoreRowLines: ignoreRowLines, + }) + return g.p.box, nil +} diff --git a/painter.go b/painter.go index 95469f3..851fe11 100644 --- a/painter.go +++ b/painter.go @@ -32,7 +32,7 @@ import ( ) type Painter struct { - render Renderer + render chart.Renderer box Box font *truetype.Font parent *Painter