Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Newpaint: support for core newpaint branch #4

Draft
wants to merge 13 commits into
base: main
Choose a base branch
from
Draft

Newpaint: support for core newpaint branch #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d6fa7c8
newpaint: support for newpaint branch of core
rcoreilly Feb 14, 2025
c3f14b3
Merge branch 'main' into newpaint
rcoreilly Feb 15, 2025
da99581
newpaint: update to textcore.Editor etc instead of texteditor
rcoreilly Feb 17, 2025
b0c5137
newpaint: updates for textcore -- all updated except plot needs updat…
rcoreilly Feb 19, 2025
823c34c
plotting drawing all updated to new paint, with logic for direct draw…
rcoreilly Feb 20, 2025
cc8bcfe
plotcore updated to direct render to scene
rcoreilly Feb 20, 2025
6171a10
plotcore update docs and interactive point hover working
rcoreilly Feb 20, 2025
2a6f3fe
newpaint: all building now -- still a few issues with plots that need…
rcoreilly Feb 20, 2025
af3bff1
newpaint: generate update
rcoreilly Feb 20, 2025
8550d4f
cleanup metadata docs and basic tensor docs
rcoreilly Feb 22, 2025
da096f2
generate
rcoreilly Feb 22, 2025
8e078fc
newpaint: plot fully updated, changed order of points, all tests good.
rcoreilly Feb 27, 2025
9e58227
newpaint: plot uses Rotate2DAround and works well.
rcoreilly Feb 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion goal/complete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

"cogentcore.org/core/base/errors"
"cogentcore.org/core/icons"
"cogentcore.org/core/parse/complete"
"cogentcore.org/core/text/parse/complete"
"github.com/mitchellh/go-homedir"
)

Expand Down
2 changes: 1 addition & 1 deletion lab/filetree.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"cogentcore.org/core/icons"
"cogentcore.org/core/styles"
"cogentcore.org/core/styles/states"
"cogentcore.org/core/texteditor/diffbrowser"
"cogentcore.org/core/text/diffbrowser"
"cogentcore.org/core/tree"
"cogentcore.org/core/types"
"cogentcore.org/lab/table"
Expand Down
20 changes: 10 additions & 10 deletions lab/tabs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"cogentcore.org/core/base/fsx"
"cogentcore.org/core/core"
"cogentcore.org/core/styles"
"cogentcore.org/core/texteditor"
"cogentcore.org/core/text/textcore"
"cogentcore.org/lab/plot"
"cogentcore.org/lab/plotcore"
"cogentcore.org/lab/table"
Expand Down Expand Up @@ -231,32 +231,32 @@ func (ts *Tabs) SliceTable(label string, slc any) *core.Table {
return tv
}

// EditorString recycles a [texteditor.Editor] tab, displaying given string.
func (ts *Tabs) EditorString(label, content string) *texteditor.Editor {
ed := NewTab(ts, label, func(tab *core.Frame) *texteditor.Editor {
ed := texteditor.NewEditor(tab)
// EditorString recycles a [textcore.Editor] tab, displaying given string.
func (ts *Tabs) EditorString(label, content string) *textcore.Editor {
ed := NewTab(ts, label, func(tab *core.Frame) *textcore.Editor {
ed := textcore.NewEditor(tab)
ed.Styler(func(s *styles.Style) {
s.Grow.Set(1, 1)
})
return ed
})
if content != "" {
ed.Buffer.SetText([]byte(content))
ed.Lines.SetText([]byte(content))
}
ts.Update()
return ed
}

// EditorFile opens an editor tab for given file.
func (ts *Tabs) EditorFile(label, filename string) *texteditor.Editor {
ed := NewTab(ts, label, func(tab *core.Frame) *texteditor.Editor {
ed := texteditor.NewEditor(tab)
func (ts *Tabs) EditorFile(label, filename string) *textcore.Editor {
ed := NewTab(ts, label, func(tab *core.Frame) *textcore.Editor {
ed := textcore.NewEditor(tab)
ed.Styler(func(s *styles.Style) {
s.Grow.Set(1, 1)
})
return ed
})
ed.Buffer.Open(core.Filename(filename))
ed.Lines.Open(filename)
ts.Update()
return ed
}
128 changes: 49 additions & 79 deletions plot/draw.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,80 +10,50 @@
package plot

import (
"bufio"
"bytes"
"image"
"io"
"os"

"cogentcore.org/core/math32"
"cogentcore.org/core/paint/render"
"cogentcore.org/core/styles"
"cogentcore.org/core/styles/sides"
)

// SVGString returns an SVG representation of the plot as a string
func (pt *Plot) SVGString() string {
b := &bytes.Buffer{}
pt.Paint.SVGOut = b
pt.svgDraw()
pt.Paint.SVGOut = nil
return b.String()
}

// svgDraw draws SVGOut writer that must already be set in Paint
func (pt *Plot) svgDraw() {
pt.drawConfig()
io.WriteString(pt.Paint.SVGOut, pt.Paint.SVGStart())
pt.Draw()
io.WriteString(pt.Paint.SVGOut, pt.Paint.SVGEnd())
}

// SVGToFile saves the SVG to given file
func (pt *Plot) SVGToFile(filename string) error {
fp, err := os.Create(filename)
if err != nil {
return err
}
defer fp.Close()
bw := bufio.NewWriter(fp)
pt.Paint.SVGOut = bw
pt.svgDraw()
pt.Paint.SVGOut = nil
return bw.Flush()
}

// drawConfig configures everything for drawing, applying styles etc.
func (pt *Plot) drawConfig() {
pt.applyStyle()
pt.Resize(pt.Size) // ensure
pt.X.drawConfig()
pt.Y.drawConfig()
pt.Z.drawConfig()
pt.Paint.ToDots()
pt.Painter.ToDots()
}

// Draw draws the plot to image.
// Plotters are drawn in the order in which they were
// added to the plot.
func (pt *Plot) Draw() {
pt.drawConfig()
pc := pt.Paint
ptw := float32(pt.Size.X)
pth := float32(pt.Size.X)
pc := pt.Painter

ptb := pt.PaintBox
off := math32.FromPoint(pt.PaintBox.Min)
sz := pt.PaintBox.Size()
ptw := float32(sz.X)
pth := float32(sz.Y)

ptb := image.Rectangle{Max: pt.Size}
pc.PushBounds(ptb)
pc.PushContext(nil, render.NewBoundsRect(pt.PaintBox, sides.Floats{}))

if pt.Style.Background != nil {
pc.BlitBox(math32.Vector2{}, math32.FromPoint(pt.Size), pt.Style.Background)
pc.BlitBox(off, math32.FromPoint(sz), pt.Style.Background)
}

if pt.Title.Text != "" {
pt.Title.Config(pt)
pos := pt.Title.PosX(ptw)
pad := pt.Title.Style.Padding.Dots
pos.Y = pad
pt.Title.Draw(pt, pos)
th := pt.Title.PaintText.BBox.Size().Y + 2*pad
pt.Title.Draw(pt, pos.Add(off))
rsz := pt.Title.PaintText.Bounds.Size().Ceil()
th := rsz.Y + 2*pad
pth -= th
ptb.Min.Y += int(math32.Ceil(th))
}
Expand All @@ -92,19 +62,19 @@ func (pt *Plot) Draw() {
pt.Y.SanitizeRange()

ywidth, tickWidth, tpad, bpad := pt.Y.sizeY(pt)
xheight, lpad, rpad := pt.X.sizeX(pt, float32(pt.Size.X-int(ywidth)))
xheight, lpad, rpad := pt.X.sizeX(pt, float32(sz.X-int(ywidth)))

tb := ptb
tb.Min.X += ywidth
pc.PushBounds(tb)
pt.PushBounds(tb)
pt.X.drawX(pt, lpad, rpad)
pc.PopBounds()
pc.PopContext()

tb = ptb
tb.Max.Y -= xheight
pc.PushBounds(tb)
pt.PushBounds(tb)
pt.Y.drawY(pt, tickWidth, tpad, bpad)
pc.PopBounds()
pc.PopContext()

tb = ptb
tb.Min.X += ywidth + lpad
Expand All @@ -118,15 +88,16 @@ func (pt *Plot) Draw() {
tb.Min.Y -= 2
tb.Max.X += 2
tb.Max.Y += 2
pc.PushBounds(tb)
pt.PushBounds(tb)

for _, plt := range pt.Plotters {
plt.Plot(pt)
}

pt.Legend.draw(pt)
pc.PopBounds()
pc.PopBounds() // global
pc.PopContext()
pc.PopContext() // global
pc.RenderDone()
}

//////// Axis
Expand All @@ -141,14 +112,14 @@ func (ax *Axis) sizeX(pt *Plot, axw float32) (ht, lpad, rpad int) {
if !ax.Style.On {
return
}
pc := pt.Paint
pc := pt.Painter
uc := &pc.UnitContext
ax.Style.TickLength.ToDots(uc)
ax.ticks = ax.Ticker.Ticks(ax.Range.Min, ax.Range.Max, ax.Style.NTicks)
h := float32(0)
if ax.Label.Text != "" { // We assume that the label isn't rotated.
ax.Label.Config(pt)
h += ax.Label.PaintText.BBox.Size().Y
h += ax.Label.Size().Y
h += ax.Label.Style.Padding.Dots
}
lw := ax.Style.Line.Width.Dots
Expand All @@ -165,20 +136,20 @@ func (ax *Axis) sizeX(pt *Plot, axw float32) (ht, lpad, rpad int) {
if px < 0 {
lpad += int(math32.Ceil(-px))
}
tht = max(tht, ax.TickText.PaintText.BBox.Size().Y)
tht = max(tht, ax.TickText.Size().Y)
}
ltk := ax.lastTickLabel()
if ltk.Label != "" {
px, wd := ax.tickPosX(pt, ltk, axw)
if px+wd > axw {
rpad += int(math32.Ceil((px + wd) - axw))
}
tht = max(tht, ax.TickText.PaintText.BBox.Size().Y)
tht = max(tht, ax.TickText.Size().Y)
}
ax.TickText.Text = ax.longestTickLabel()
if ax.TickText.Text != "" {
ax.TickText.Config(pt)
tht = max(tht, ax.TickText.PaintText.BBox.Size().Y)
tht = max(tht, ax.TickText.Size().Y)
}
h += ax.TickText.Style.Padding.Dots
}
Expand All @@ -199,7 +170,7 @@ func (ax *Axis) tickPosX(pt *Plot, t Tick, axw float32) (px, wd float32) {
ax.TickText.Config(pt)
pos := ax.TickText.PosX(0)
px = pos.X + x
wd = ax.TickText.PaintText.BBox.Size().X
wd = ax.TickText.Size().X
return
}

Expand Down Expand Up @@ -237,15 +208,15 @@ func (ax *Axis) sizeY(pt *Plot) (ywidth, tickWidth, tpad, bpad int) {
if !ax.Style.On {
return
}
pc := pt.Paint
pc := pt.Painter
uc := &pc.UnitContext
ax.ticks = ax.Ticker.Ticks(ax.Range.Min, ax.Range.Max, ax.Style.NTicks)
ax.Style.TickLength.ToDots(uc)

w := float32(0)
if ax.Label.Text != "" {
ax.Label.Config(pt)
w += ax.Label.PaintText.BBox.Size().X
w += ax.Label.Size().X
w += ax.Label.Style.Padding.Dots
}

Expand All @@ -260,11 +231,11 @@ func (ax *Axis) sizeY(pt *Plot) (ywidth, tickWidth, tpad, bpad int) {
ax.TickText.Text = ax.longestTickLabel()
if ax.TickText.Text != "" {
ax.TickText.Config(pt)
tw := ax.TickText.PaintText.BBox.Size().X
tw := ax.TickText.Size().X
w += tw
tickWidth = int(math32.Ceil(tw))
w += ax.TickText.Style.Padding.Dots
tht := int(math32.Ceil(0.5 * ax.TickText.PaintText.BBox.Size().X))
tht := int(math32.Ceil(0.5 * ax.TickText.Size().X))
tpad += tht
bpad += tht
}
Expand All @@ -279,7 +250,7 @@ func (ax *Axis) drawX(pt *Plot, lpad, rpad int) {
if !ax.Style.On {
return
}
ab := pt.Paint.Bounds
ab := pt.CurBounds()
ab.Min.X += lpad
ab.Max.X -= rpad
axw := float32(ab.Size().X)
Expand All @@ -288,7 +259,7 @@ func (ax *Axis) drawX(pt *Plot, lpad, rpad int) {
ax.Label.Config(pt)
pos := ax.Label.PosX(axw)
pos.X += float32(ab.Min.X)
th := ax.Label.PaintText.BBox.Size().Y
th := ax.Label.Size().Y
pos.Y = float32(ab.Max.Y) - th
ax.Label.Draw(pt, pos)
ab.Max.Y -= int(math32.Ceil(th + ax.Label.Style.Padding.Dots))
Expand All @@ -304,7 +275,7 @@ func (ax *Axis) drawX(pt *Plot, lpad, rpad int) {
ax.TickText.Config(pt)
pos := ax.TickText.PosX(0)
pos.X += x + float32(ab.Min.X)
tickHt = ax.TickText.PaintText.BBox.Size().Y + ax.TickText.Style.Padding.Dots
tickHt = ax.TickText.Size().Y + ax.TickText.Style.Padding.Dots
pos.Y += float32(ab.Max.Y) - tickHt
ax.TickText.Draw(pt, pos)
}
Expand Down Expand Up @@ -340,15 +311,15 @@ func (ax *Axis) drawY(pt *Plot, tickWidth, tpad, bpad int) {
if !ax.Style.On {
return
}
ab := pt.Paint.Bounds
ab := pt.CurBounds()
ab.Min.Y += tpad
ab.Max.Y -= bpad
axh := float32(ab.Size().Y)
if ax.Label.Text != "" {
ax.Label.Style.Align = styles.Center
pos := ax.Label.PosY(axh)
tw := ax.Label.PaintText.BBox.Size().X
pos.Y += float32(ab.Min.Y) + ax.Label.PaintText.BBox.Size().Y
tw := ax.Label.Size().X
pos.Y += float32(ab.Min.Y) + ax.Label.Size().Y
pos.X = float32(ab.Min.X)
ax.Label.Draw(pt, pos)
ab.Min.X += int(math32.Ceil(tw + ax.Label.Style.Padding.Dots))
Expand All @@ -364,8 +335,8 @@ func (ax *Axis) drawY(pt *Plot, tickWidth, tpad, bpad int) {
ax.TickText.Config(pt)
pos := ax.TickText.PosX(float32(tickWidth))
pos.X += float32(ab.Min.X)
pos.Y = float32(ab.Min.Y) + y - 0.5*ax.TickText.PaintText.BBox.Size().Y
tickWd = max(tickWd, ax.TickText.PaintText.BBox.Size().X+ax.TickText.Style.Padding.Dots)
pos.Y = float32(ab.Min.Y) + y - 0.5*ax.TickText.Size().Y
tickWd = max(tickWd, ax.TickText.Size().X+ax.TickText.Style.Padding.Dots)
ax.TickText.Draw(pt, pos)
}

Expand Down Expand Up @@ -399,9 +370,9 @@ func (ax *Axis) drawY(pt *Plot, tickWidth, tpad, bpad int) {

// draw draws the legend
func (lg *Legend) draw(pt *Plot) {
pc := pt.Paint
pc := pt.Painter
uc := &pc.UnitContext
ptb := pc.Bounds
ptb := pt.CurBounds()

lg.Style.ThumbnailWidth.ToDots(uc)
lg.Style.Position.XOffs.ToDots(uc)
Expand All @@ -412,15 +383,14 @@ func (lg *Legend) draw(pt *Plot) {
ltxt.Style = lg.Style.Text
ltxt.ToDots(uc)
pad := math32.Ceil(ltxt.Style.Padding.Dots)
ltxt.openFont(pt)
em := ltxt.font.Face.Metrics.Em
em := ltxt.textStyle.FontSize.Dots
var sz image.Point
maxTht := 0
for _, e := range lg.Entries {
ltxt.Text = e.Text
ltxt.Config(pt)
sz.X = max(sz.X, int(math32.Ceil(ltxt.PaintText.BBox.Size().X)))
tht := int(math32.Ceil(ltxt.PaintText.BBox.Size().Y + pad))
sz.X = max(sz.X, int(math32.Ceil(ltxt.Size().X)))
tht := int(math32.Ceil(ltxt.Size().Y + pad))
maxTht = max(tht, maxTht)
}
sz.X += int(em)
Expand Down Expand Up @@ -450,11 +420,11 @@ func (lg *Legend) draw(pt *Plot) {
tp.X += int(txsz.X)
tp.Y += int(pad)
tb := image.Rectangle{Min: tp, Max: tp.Add(thsz)}
pc.PushBounds(tb)
pt.PushBounds(tb)
for _, t := range e.Thumbs {
t.Thumbnail(pt)
}
pc.PopBounds()
pc.PopContext()
ltxt.Text = e.Text
ltxt.Config(pt)
ltxt.Draw(pt, math32.FromPoint(cp))
Expand Down
Loading
Loading