Skip to content

Commit

Permalink
update to cogentcore and fix tableview scrolling
Browse files Browse the repository at this point in the history
  • Loading branch information
@rcoreilly
rcoreilly committed Jan 17, 2024
1 parent faeae05 commit 807c624
Show file tree
Hide file tree
Showing 49 changed files with 120 additions and 116 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,5 +157,5 @@ mean := desc.CellFloat("ColNm", desc.RowsByString("Agg", "Mean", etable.Equals,

# Developer info

The visualization tools use the [GoGi](https://github.com/goki/gi) GUI and the struct fields use the `desc` tag for documentation. Use the modified `goimports` tool to auto-update standard comments based on these tags: https://goki.dev/docs/general/structfieldcomments/
The visualization tools use the [GoGi](https://github.com/goki/gi) GUI and the struct fields use the `desc` tag for documentation. Use the modified `goimports` tool to auto-update standard comments based on these tags: https://cogentcore.org/core/docs/general/structfieldcomments/

2 changes: 1 addition & 1 deletion agg/enumgen.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion clust/clust.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"math"
"math/rand"

"cogentcore.org/core/glop/indent"
"github.com/emer/etable/v2/etensor"
"github.com/emer/etable/v2/norm"
"github.com/emer/etable/v2/simat"
"goki.dev/glop/indent"
)

// Node is one node in the cluster
Expand Down
2 changes: 1 addition & 1 deletion clust/enumgen.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion convolve/convolve_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package convolve
import (
"testing"

"goki.dev/mat32"
"cogentcore.org/core/mat32"
)

func TestConv32(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion convolve/kernel.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package convolve
import (
"math"

"goki.dev/mat32"
"cogentcore.org/core/mat32"
)

// GaussianKernel32 returns a normalized gaussian kernel for smoothing
Expand Down
2 changes: 1 addition & 1 deletion eplot/barplot.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"log"
"math"

"cogentcore.org/core/colors"
"github.com/emer/etable/v2/etable"
"github.com/emer/etable/v2/minmax"
"github.com/emer/etable/v2/split"
"goki.dev/colors"
"gonum.org/v1/plot"
"gonum.org/v1/plot/plotter"
"gonum.org/v1/plot/vg/draw"
Expand Down
2 changes: 1 addition & 1 deletion eplot/enumgen.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions eplot/eplot2d.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ import (
"path/filepath"
"strings"

"cogentcore.org/core/colors"
"cogentcore.org/core/events"
"cogentcore.org/core/gi"
"cogentcore.org/core/giv"
"cogentcore.org/core/icons"
"cogentcore.org/core/ki"
"cogentcore.org/core/mat32"
"cogentcore.org/core/states"
"cogentcore.org/core/styles"
"github.com/emer/etable/v2/etable"
"github.com/emer/etable/v2/etensor"
"github.com/emer/etable/v2/etview"
"goki.dev/colors"
"goki.dev/events"
"goki.dev/gi"
"goki.dev/giv"
"goki.dev/icons"
"goki.dev/ki"
"goki.dev/mat32"
"goki.dev/states"
"goki.dev/styles"
"gonum.org/v1/plot"
"gonum.org/v1/plot/font"
)
Expand Down
2 changes: 1 addition & 1 deletion eplot/gisvg.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"log/slog"
"os"

"goki.dev/gi"
"cogentcore.org/core/gi"
"gonum.org/v1/plot"
"gonum.org/v1/plot/vg"
"gonum.org/v1/plot/vg/draw"
Expand Down
6 changes: 3 additions & 3 deletions eplot/gtigen.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions eplot/params.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"image/color"
"strings"

"cogentcore.org/core/glop/option"
"cogentcore.org/core/laser"
"github.com/emer/etable/v2/etable"
"github.com/emer/etable/v2/minmax"
"goki.dev/glop/option"
"goki.dev/laser"
)

// PlotParams are parameters for overall plot
Expand Down
10 changes: 5 additions & 5 deletions eplot/values.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
package eplot

import (
"goki.dev/gi"
"goki.dev/giv"
"goki.dev/gti"
"goki.dev/laser"
"goki.dev/styles"
"cogentcore.org/core/gi"
"cogentcore.org/core/giv"
"cogentcore.org/core/gti"
"cogentcore.org/core/laser"
"cogentcore.org/core/styles"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions eplot/xyplot.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
"log/slog"
"math"

"cogentcore.org/core/colors"
"cogentcore.org/core/grr"
"github.com/emer/etable/v2/etable"
"github.com/emer/etable/v2/etensor"
"github.com/emer/etable/v2/split"
"goki.dev/colors"
"goki.dev/grr"
"gonum.org/v1/plot"
"gonum.org/v1/plot/plotter"
"gonum.org/v1/plot/vg"
Expand Down
2 changes: 1 addition & 1 deletion etable/enumgen.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion etable/gtigen.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion etable/io.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"strconv"
"strings"

"cogentcore.org/core/gi"
"github.com/emer/etable/v2/etensor"
"goki.dev/gi"
)

// Delim are standard CSV delimiter options (Tab, Comma, Space)
Expand Down
2 changes: 1 addition & 1 deletion etensor/bits.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"log"
"strings"

"cogentcore.org/core/laser"
"github.com/apache/arrow/go/arrow"
"github.com/emer/etable/v2/bitslice"
"goki.dev/laser"
"gonum.org/v1/gonum/mat"
)

Expand Down
2 changes: 1 addition & 1 deletion etensor/enumgen.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion etensor/float64.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import (
"strconv"
"strings"

"cogentcore.org/core/laser"
"github.com/apache/arrow/go/arrow/array"
"github.com/apache/arrow/go/arrow/memory"
"github.com/apache/arrow/go/arrow/tensor"
"github.com/emer/etable/v2/bitslice"
"goki.dev/laser"
"gonum.org/v1/gonum/mat"
)

Expand Down
2 changes: 1 addition & 1 deletion etensor/int.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import (
"strconv"
"unsafe"

"cogentcore.org/core/laser"
"github.com/apache/arrow/go/arrow/array"
"github.com/apache/arrow/go/arrow/memory"
"github.com/apache/arrow/go/arrow/tensor"
"github.com/emer/etable/v2/bitslice"
"goki.dev/laser"
"gonum.org/v1/gonum/mat"
)

Expand Down
2 changes: 1 addition & 1 deletion etensor/io.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"os"
"strconv"

"goki.dev/gi"
"cogentcore.org/core/gi"
)

// SaveCSV writes a tensor to a comma-separated-values (CSV) file
Expand Down
2 changes: 1 addition & 1 deletion etensor/numeric.gen.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion etensor/numeric.gen.go.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/apache/arrow/go/arrow/memory"
"github.com/apache/arrow/go/arrow/tensor"
"github.com/emer/etable/v2/bitslice"
"goki.dev/laser"
"cogentcore.org/core/laser"
"gonum.org/v1/gonum/mat"
)

Expand Down
2 changes: 1 addition & 1 deletion etview/dialogs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
package etview

import (
"cogentcore.org/core/gi"
"github.com/emer/etable/v2/etable"
"github.com/emer/etable/v2/etensor"
"github.com/emer/etable/v2/simat"
"goki.dev/gi"
)

/*
Expand Down
12 changes: 6 additions & 6 deletions etview/gtigen.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions etview/simatgrid.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
package etview

import (
"cogentcore.org/core/mat32"
"cogentcore.org/core/paint"
"cogentcore.org/core/styles"
"github.com/emer/etable/v2/etensor"
"github.com/emer/etable/v2/simat"
"goki.dev/mat32"
"goki.dev/paint"
"goki.dev/styles"
)

const LabelSpace = float32(8)
Expand Down
25 changes: 12 additions & 13 deletions etview/tableview.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,20 @@ import (
"strconv"
"strings"

"cogentcore.org/core/abilities"
"cogentcore.org/core/colors"
"cogentcore.org/core/events"
"cogentcore.org/core/gi"
"cogentcore.org/core/giv"
"cogentcore.org/core/grr"
"cogentcore.org/core/icons"
"cogentcore.org/core/ki"
"cogentcore.org/core/laser"
"cogentcore.org/core/states"
"cogentcore.org/core/styles"
"cogentcore.org/core/units"
"github.com/emer/etable/v2/etable"
"github.com/emer/etable/v2/etensor"
"goki.dev/abilities"
"goki.dev/colors"
"goki.dev/events"
"goki.dev/gi"
"goki.dev/giv"
"goki.dev/grr"
"goki.dev/icons"
"goki.dev/ki"
"goki.dev/laser"
"goki.dev/states"
"goki.dev/styles"
"goki.dev/units"
)

// etview.TableView provides a GUI interface for etable.Table's
Expand Down Expand Up @@ -627,7 +627,6 @@ func (tv *TableView) UpdateWidgets() {
if tv.IsReadOnly() && tv.SelIdx >= 0 {
tv.SelectIdx(tv.SelIdx)
}
tv.UpdateScroll()
}

// ColTensorBlank returns tensor blanks for given tensor col
Expand Down
14 changes: 7 additions & 7 deletions etview/tensorgrid.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ import (
"log"
"strconv"

"cogentcore.org/core/colors"
"cogentcore.org/core/colors/colormap"
"cogentcore.org/core/events"
"cogentcore.org/core/gi"
"cogentcore.org/core/giv"
"cogentcore.org/core/mat32"
"cogentcore.org/core/styles"
"github.com/emer/etable/v2/etensor"
"github.com/emer/etable/v2/minmax"
"goki.dev/colors"
"goki.dev/colors/colormap"
"goki.dev/events"
"goki.dev/gi"
"goki.dev/giv"
"goki.dev/mat32"
"goki.dev/styles"
)

// TensorLayout are layout options for displaying tensors
Expand Down
2 changes: 1 addition & 1 deletion etview/tensorview_old.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
package etview

import (
"goki.dev/gi"
"cogentcore.org/core/gi"
)

// etview.TensorView provides a GUI interface for etable.Tensor's
Expand Down
Loading

0 comments on commit 807c624

Please sign in to comment.