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

Jump to bottom

improve default axis type #1935

Merged
merged 12 commits into from
May 13, 2022
Merged

improve default axis type #1935

merged 12 commits into from
May 13, 2022

Conversation

SimonDanisch
Copy link
Member

After a discussion with @jkrumbiegel & @ffreyer, we decided to make things less magical and don't actually look into the z coordinates to switch between 2D/3D axis.
Also, I changed the name into preferred_axis_type, which can be now overloaded to return any type that functions as an Axis (LScene, Axis3, Axis so far, but could be used in e.g. GeoMakie to change the Axis based on argument/plot types).
This now requires a couple of explicit axis types in the tests, since some have gotten a 2D axis before, which now need an explicit "cast" to use the 2D axis (e.g. 2D surface plot).

SimonDanisch and others added 7 commits May 13, 2022 12:20
@SimonDanisch
don't use data_limits to figure out axis type (#1770)
7def563 
* don't use data_limits to figure out axis type

* fix is2d

* fix tests

* fix heatmap

* fix remaining tests

* Update contours.jl

* fix comments
@SimonDanisch
fix 2d surfaces, add test (#1913)
94280e0
@SimonDanisch
[breaking] clean up conversion pipeline (#1810)
7b26121 
* convert more orderly

* fix problems

* ok, we can't actually recursively convert

* the need for recursion

* fix conversions

* geometry improvements

* fix surface

* fix surface

* remove unused files

* fix heatmap with Intervals

* bring back nice errors, by introducing proper per plot convert targets

* fix plot

* fix tests

* reset runtests

* address review

* resurrect Grid and address last review comment
@SimonDanisch
fix surface
f4dedea
@SimonDanisch
fix tests
6c5f16f
@SimonDanisch
less magic, clearer name
2a9ee66
@SimonDanisch
fix remaining signatures, fix tests
bc1ced9
@MakieBot
Copy link
Collaborator

MakieBot commented May 13, 2022 •
edited
Loading

Compile Times benchmark

Note, that these numbers may fluctuate on the CI servers, so take them with a grain of salt.

using time

master:  10.53 < 10.64 > 11.71, 0.53+-
pr:      10.07 < 10.47 > 11.47, 0.60+-
speedup: 0.93 < 1.02 > 1.06, 0.04+-
median:  -1.66% => invariant

This PR does not change the using time.

ttfp time

master   24.91 < 25.56 > 28.19, 1.37+-
pr       24.24 < 25.53 > 27.40, 1.37+-
speedup: 0.91 < 1.03 > 1.06, 0.05+-
median:  -0.08% => invariant

This PR does not change the ttfp time.

@SimonDanisch SimonDanisch merged commit 2aaf674 into breaking-release May 13, 2022
@SimonDanisch SimonDanisch deleted the sd/improve-axis-type branch May 13, 2022 17:04
SimonDanisch added a commit that referenced this pull request May 20, 2022
@SimonDanisch
improve default axis type (#1935)
d129cf3 
* don't use data_limits to figure out axis type (#1770)

* don't use data_limits to figure out axis type

* fix is2d

* fix tests

* fix heatmap

* fix remaining tests

* Update contours.jl

* fix comments

* fix 2d surfaces, add test (#1913)

* [breaking] clean up conversion pipeline (#1810)

* convert more orderly

* fix problems

* ok, we can't actually recursively convert

* the need for recursion

* fix conversions

* geometry improvements

* fix surface

* fix surface

* remove unused files

* fix heatmap with Intervals

* bring back nice errors, by introducing proper per plot convert targets

* fix plot

* fix tests

* reset runtests

* address review

* resurrect Grid and address last review comment

* fix surface

* fix tests

* less magic, clearer name

* fix remaining signatures, fix tests

* fix makie tests

* fix matrix_grid

* gotta remove flat surface from WGLMakie tests :(

* fix merge conflicts vscode didn't show
SimonDanisch added a commit that referenced this pull request May 23, 2022
@SimonDanisch
improve default axis type (#1935)
16b6fb2 
* don't use data_limits to figure out axis type (#1770)

* don't use data_limits to figure out axis type

* fix is2d

* fix tests

* fix heatmap

* fix remaining tests

* Update contours.jl

* fix comments

* fix 2d surfaces, add test (#1913)

* [breaking] clean up conversion pipeline (#1810)

* convert more orderly

* fix problems

* ok, we can't actually recursively convert

* the need for recursion

* fix conversions

* geometry improvements

* fix surface

* fix surface

* remove unused files

* fix heatmap with Intervals

* bring back nice errors, by introducing proper per plot convert targets

* fix plot

* fix tests

* reset runtests

* address review

* resurrect Grid and address last review comment

* fix surface

* fix tests

* less magic, clearer name

* fix remaining signatures, fix tests

* fix makie tests

* fix matrix_grid

* gotta remove flat surface from WGLMakie tests :(

* fix merge conflicts vscode didn't show
SimonDanisch added a commit that referenced this pull request May 27, 2022
@SimonDanisch
improve default axis type (#1935)
8f2eda2 
* don't use data_limits to figure out axis type (#1770)

* don't use data_limits to figure out axis type

* fix is2d

* fix tests

* fix heatmap

* fix remaining tests

* Update contours.jl

* fix comments

* fix 2d surfaces, add test (#1913)

* [breaking] clean up conversion pipeline (#1810)

* convert more orderly

* fix problems

* ok, we can't actually recursively convert

* the need for recursion

* fix conversions

* geometry improvements

* fix surface

* fix surface

* remove unused files

* fix heatmap with Intervals

* bring back nice errors, by introducing proper per plot convert targets

* fix plot

* fix tests

* reset runtests

* address review

* resurrect Grid and address last review comment

* fix surface

* fix tests

* less magic, clearer name

* fix remaining signatures, fix tests

* fix makie tests

* fix matrix_grid

* gotta remove flat surface from WGLMakie tests :(

* fix merge conflicts vscode didn't show
SimonDanisch added a commit that referenced this pull request May 30, 2022
@SimonDanisch
improve default axis type (#1935)
dd5da31 
* don't use data_limits to figure out axis type (#1770)

* don't use data_limits to figure out axis type

* fix is2d

* fix tests

* fix heatmap

* fix remaining tests

* Update contours.jl

* fix comments

* fix 2d surfaces, add test (#1913)

* [breaking] clean up conversion pipeline (#1810)

* convert more orderly

* fix problems

* ok, we can't actually recursively convert

* the need for recursion

* fix conversions

* geometry improvements

* fix surface

* fix surface

* remove unused files

* fix heatmap with Intervals

* bring back nice errors, by introducing proper per plot convert targets

* fix plot

* fix tests

* reset runtests

* address review

* resurrect Grid and address last review comment

* fix surface

* fix tests

* less magic, clearer name

* fix remaining signatures, fix tests

* fix makie tests

* fix matrix_grid

* gotta remove flat surface from WGLMakie tests :(

* fix merge conflicts vscode didn't show
SimonDanisch added a commit that referenced this pull request May 30, 2022
@SimonDanisch
improve default axis type (#1935)
63012fe 
* don't use data_limits to figure out axis type (#1770)

* don't use data_limits to figure out axis type

* fix is2d

* fix tests

* fix heatmap

* fix remaining tests

* Update contours.jl

* fix comments

* fix 2d surfaces, add test (#1913)

* [breaking] clean up conversion pipeline (#1810)

* convert more orderly

* fix problems

* ok, we can't actually recursively convert

* the need for recursion

* fix conversions

* geometry improvements

* fix surface

* fix surface

* remove unused files

* fix heatmap with Intervals

* bring back nice errors, by introducing proper per plot convert targets

* fix plot

* fix tests

* reset runtests

* address review

* resurrect Grid and address last review comment

* fix surface

* fix tests

* less magic, clearer name

* fix remaining signatures, fix tests

* fix makie tests

* fix matrix_grid

* gotta remove flat surface from WGLMakie tests :(

* fix merge conflicts vscode didn't show
SimonDanisch added a commit that referenced this pull request May 30, 2022
@SimonDanisch
improve default axis type (#1935)
868f1b4 
* don't use data_limits to figure out axis type (#1770)

* don't use data_limits to figure out axis type

* fix is2d

* fix tests

* fix heatmap

* fix remaining tests

* Update contours.jl

* fix comments

* fix 2d surfaces, add test (#1913)

* [breaking] clean up conversion pipeline (#1810)

* convert more orderly

* fix problems

* ok, we can't actually recursively convert

* the need for recursion

* fix conversions

* geometry improvements

* fix surface

* fix surface

* remove unused files

* fix heatmap with Intervals

* bring back nice errors, by introducing proper per plot convert targets

* fix plot

* fix tests

* reset runtests

* address review

* resurrect Grid and address last review comment

* fix surface

* fix tests

* less magic, clearer name

* fix remaining signatures, fix tests

* fix makie tests

* fix matrix_grid

* gotta remove flat surface from WGLMakie tests :(

* fix merge conflicts vscode didn't show
SimonDanisch added a commit that referenced this pull request May 31, 2022
@SimonDanisch
improve default axis type (#1935)
10e448e 
* don't use data_limits to figure out axis type (#1770)

* don't use data_limits to figure out axis type

* fix is2d

* fix tests

* fix heatmap

* fix remaining tests

* Update contours.jl

* fix comments

* fix 2d surfaces, add test (#1913)

* [breaking] clean up conversion pipeline (#1810)

* convert more orderly

* fix problems

* ok, we can't actually recursively convert

* the need for recursion

* fix conversions

* geometry improvements

* fix surface

* fix surface

* remove unused files

* fix heatmap with Intervals

* bring back nice errors, by introducing proper per plot convert targets

* fix plot

* fix tests

* reset runtests

* address review

* resurrect Grid and address last review comment

* fix surface

* fix tests

* less magic, clearer name

* fix remaining signatures, fix tests

* fix makie tests

* fix matrix_grid

* gotta remove flat surface from WGLMakie tests :(

* fix merge conflicts vscode didn't show
SimonDanisch added a commit that referenced this pull request Jun 7, 2022
@SimonDanisch
improve default axis type (#1935)
552bfab 
* don't use data_limits to figure out axis type (#1770)

* don't use data_limits to figure out axis type

* fix is2d

* fix tests

* fix heatmap

* fix remaining tests

* Update contours.jl

* fix comments

* fix 2d surfaces, add test (#1913)

* [breaking] clean up conversion pipeline (#1810)

* convert more orderly

* fix problems

* ok, we can't actually recursively convert

* the need for recursion

* fix conversions

* geometry improvements

* fix surface

* fix surface

* remove unused files

* fix heatmap with Intervals

* bring back nice errors, by introducing proper per plot convert targets

* fix plot

* fix tests

* reset runtests

* address review

* resurrect Grid and address last review comment

* fix surface

* fix tests

* less magic, clearer name

* fix remaining signatures, fix tests

* fix makie tests

* fix matrix_grid

* gotta remove flat surface from WGLMakie tests :(

* fix merge conflicts vscode didn't show
SimonDanisch added a commit that referenced this pull request Jun 7, 2022
@SimonDanisch
improve default axis type (#1935)
87c1157 
* don't use data_limits to figure out axis type (#1770)

* don't use data_limits to figure out axis type

* fix is2d

* fix tests

* fix heatmap

* fix remaining tests

* Update contours.jl

* fix comments

* fix 2d surfaces, add test (#1913)

* [breaking] clean up conversion pipeline (#1810)

* convert more orderly

* fix problems

* ok, we can't actually recursively convert

* the need for recursion

* fix conversions

* geometry improvements

* fix surface

* fix surface

* remove unused files

* fix heatmap with Intervals

* bring back nice errors, by introducing proper per plot convert targets

* fix plot

* fix tests

* reset runtests

* address review

* resurrect Grid and address last review comment

* fix surface

* fix tests

* less magic, clearer name

* fix remaining signatures, fix tests

* fix makie tests

* fix matrix_grid

* gotta remove flat surface from WGLMakie tests :(

* fix merge conflicts vscode didn't show
SimonDanisch added a commit that referenced this pull request Jun 14, 2022
@SimonDanisch
improve default axis type (#1935)
ccb189f 
* don't use data_limits to figure out axis type (#1770)

* don't use data_limits to figure out axis type

* fix is2d

* fix tests

* fix heatmap

* fix remaining tests

* Update contours.jl

* fix comments

* fix 2d surfaces, add test (#1913)

* [breaking] clean up conversion pipeline (#1810)

* convert more orderly

* fix problems

* ok, we can't actually recursively convert

* the need for recursion

* fix conversions

* geometry improvements

* fix surface

* fix surface

* remove unused files

* fix heatmap with Intervals

* bring back nice errors, by introducing proper per plot convert targets

* fix plot

* fix tests

* reset runtests

* address review

* resurrect Grid and address last review comment

* fix surface

* fix tests

* less magic, clearer name

* fix remaining signatures, fix tests

* fix makie tests

* fix matrix_grid

* gotta remove flat surface from WGLMakie tests :(

* fix merge conflicts vscode didn't show
SimonDanisch added a commit that referenced this pull request Jun 14, 2022
@SimonDanisch
improve default axis type (#1935)
7823e5d 
* don't use data_limits to figure out axis type (#1770)

* don't use data_limits to figure out axis type

* fix is2d

* fix tests

* fix heatmap

* fix remaining tests

* Update contours.jl

* fix comments

* fix 2d surfaces, add test (#1913)

* [breaking] clean up conversion pipeline (#1810)

* convert more orderly

* fix problems

* ok, we can't actually recursively convert

* the need for recursion

* fix conversions

* geometry improvements

* fix surface

* fix surface

* remove unused files

* fix heatmap with Intervals

* bring back nice errors, by introducing proper per plot convert targets

* fix plot

* fix tests

* reset runtests

* address review

* resurrect Grid and address last review comment

* fix surface

* fix tests

* less magic, clearer name

* fix remaining signatures, fix tests

* fix makie tests

* fix matrix_grid

* gotta remove flat surface from WGLMakie tests :(

* fix merge conflicts vscode didn't show
SimonDanisch added a commit that referenced this pull request Jun 15, 2022
@SimonDanisch
improve default axis type (#1935)
8a47bd5 
* don't use data_limits to figure out axis type (#1770)

* don't use data_limits to figure out axis type

* fix is2d

* fix tests

* fix heatmap

* fix remaining tests

* Update contours.jl

* fix comments

* fix 2d surfaces, add test (#1913)

* [breaking] clean up conversion pipeline (#1810)

* convert more orderly

* fix problems

* ok, we can't actually recursively convert

* the need for recursion

* fix conversions

* geometry improvements

* fix surface

* fix surface

* remove unused files

* fix heatmap with Intervals

* bring back nice errors, by introducing proper per plot convert targets

* fix plot

* fix tests

* reset runtests

* address review

* resurrect Grid and address last review comment

* fix surface

* fix tests

* less magic, clearer name

* fix remaining signatures, fix tests

* fix makie tests

* fix matrix_grid

* gotta remove flat surface from WGLMakie tests :(

* fix merge conflicts vscode didn't show
SimonDanisch added a commit that referenced this pull request Jun 16, 2022
@SimonDanisch
improve default axis type (#1935)
abf93ca 
* don't use data_limits to figure out axis type (#1770)

* don't use data_limits to figure out axis type

* fix is2d

* fix tests

* fix heatmap

* fix remaining tests

* Update contours.jl

* fix comments

* fix 2d surfaces, add test (#1913)

* [breaking] clean up conversion pipeline (#1810)

* convert more orderly

* fix problems

* ok, we can't actually recursively convert

* the need for recursion

* fix conversions

* geometry improvements

* fix surface

* fix surface

* remove unused files

* fix heatmap with Intervals

* bring back nice errors, by introducing proper per plot convert targets

* fix plot

* fix tests

* reset runtests

* address review

* resurrect Grid and address last review comment

* fix surface

* fix tests

* less magic, clearer name

* fix remaining signatures, fix tests

* fix makie tests

* fix matrix_grid

* gotta remove flat surface from WGLMakie tests :(

* fix merge conflicts vscode didn't show
SimonDanisch added a commit that referenced this pull request Jun 20, 2022
@SimonDanisch
improve default axis type (#1935)
a35fbb0 
* don't use data_limits to figure out axis type (#1770)

* don't use data_limits to figure out axis type

* fix is2d

* fix tests

* fix heatmap

* fix remaining tests

* Update contours.jl

* fix comments

* fix 2d surfaces, add test (#1913)

* [breaking] clean up conversion pipeline (#1810)

* convert more orderly

* fix problems

* ok, we can't actually recursively convert

* the need for recursion

* fix conversions

* geometry improvements

* fix surface

* fix surface

* remove unused files

* fix heatmap with Intervals

* bring back nice errors, by introducing proper per plot convert targets

* fix plot

* fix tests

* reset runtests

* address review

* resurrect Grid and address last review comment

* fix surface

* fix tests

* less magic, clearer name

* fix remaining signatures, fix tests

* fix makie tests

* fix matrix_grid

* gotta remove flat surface from WGLMakie tests :(

* fix merge conflicts vscode didn't show
SimonDanisch added a commit that referenced this pull request Jun 22, 2022
@SimonDanisch
improve default axis type (#1935)
46c922e 
* don't use data_limits to figure out axis type (#1770)

* don't use data_limits to figure out axis type

* fix is2d

* fix tests

* fix heatmap

* fix remaining tests

* Update contours.jl

* fix comments

* fix 2d surfaces, add test (#1913)

* [breaking] clean up conversion pipeline (#1810)

* convert more orderly

* fix problems

* ok, we can't actually recursively convert

* the need for recursion

* fix conversions

* geometry improvements

* fix surface

* fix surface

* remove unused files

* fix heatmap with Intervals

* bring back nice errors, by introducing proper per plot convert targets

* fix plot

* fix tests

* reset runtests

* address review

* resurrect Grid and address last review comment

* fix surface

* fix tests

* less magic, clearer name

* fix remaining signatures, fix tests

* fix makie tests

* fix matrix_grid

* gotta remove flat surface from WGLMakie tests :(

* fix merge conflicts vscode didn't show
SimonDanisch added a commit that referenced this pull request Jun 22, 2022
@SimonDanisch
improve default axis type (#1935)
a908d6b 
* don't use data_limits to figure out axis type (#1770)

* don't use data_limits to figure out axis type

* fix is2d

* fix tests

* fix heatmap

* fix remaining tests

* Update contours.jl

* fix comments

* fix 2d surfaces, add test (#1913)

* [breaking] clean up conversion pipeline (#1810)

* convert more orderly

* fix problems

* ok, we can't actually recursively convert

* the need for recursion

* fix conversions

* geometry improvements

* fix surface

* fix surface

* remove unused files

* fix heatmap with Intervals

* bring back nice errors, by introducing proper per plot convert targets

* fix plot

* fix tests

* reset runtests

* address review

* resurrect Grid and address last review comment

* fix surface

* fix tests

* less magic, clearer name

* fix remaining signatures, fix tests

* fix makie tests

* fix matrix_grid

* gotta remove flat surface from WGLMakie tests :(

* fix merge conflicts vscode didn't show
SimonDanisch added a commit that referenced this pull request Jul 7, 2022
@SimonDanisch
improve default axis type (#1935)
be2dcd0 
* don't use data_limits to figure out axis type (#1770)

* don't use data_limits to figure out axis type

* fix is2d

* fix tests

* fix heatmap

* fix remaining tests

* Update contours.jl

* fix comments

* fix 2d surfaces, add test (#1913)

* [breaking] clean up conversion pipeline (#1810)

* convert more orderly

* fix problems

* ok, we can't actually recursively convert

* the need for recursion

* fix conversions

* geometry improvements

* fix surface

* fix surface

* remove unused files

* fix heatmap with Intervals

* bring back nice errors, by introducing proper per plot convert targets

* fix plot

* fix tests

* reset runtests

* address review

* resurrect Grid and address last review comment

* fix surface

* fix tests

* less magic, clearer name

* fix remaining signatures, fix tests

* fix makie tests

* fix matrix_grid

* gotta remove flat surface from WGLMakie tests :(

* fix merge conflicts vscode didn't show
SimonDanisch added a commit that referenced this pull request Jul 7, 2022
@SimonDanisch
improve default axis type (#1935)
3d383e3 
* don't use data_limits to figure out axis type (#1770)

* don't use data_limits to figure out axis type

* fix is2d

* fix tests

* fix heatmap

* fix remaining tests

* Update contours.jl

* fix comments

* fix 2d surfaces, add test (#1913)

* [breaking] clean up conversion pipeline (#1810)

* convert more orderly

* fix problems

* ok, we can't actually recursively convert

* the need for recursion

* fix conversions

* geometry improvements

* fix surface

* fix surface

* remove unused files

* fix heatmap with Intervals

* bring back nice errors, by introducing proper per plot convert targets

* fix plot

* fix tests

* reset runtests

* address review

* resurrect Grid and address last review comment

* fix surface

* fix tests

* less magic, clearer name

* fix remaining signatures, fix tests

* fix makie tests

* fix matrix_grid

* gotta remove flat surface from WGLMakie tests :(

* fix merge conflicts vscode didn't show
SimonDanisch added a commit that referenced this pull request Jul 19, 2022
@SimonDanisch
improve default axis type (#1935)
bcecc07 
* don't use data_limits to figure out axis type (#1770)

* don't use data_limits to figure out axis type

* fix is2d

* fix tests

* fix heatmap

* fix remaining tests

* Update contours.jl

* fix comments

* fix 2d surfaces, add test (#1913)

* [breaking] clean up conversion pipeline (#1810)

* convert more orderly

* fix problems

* ok, we can't actually recursively convert

* the need for recursion

* fix conversions

* geometry improvements

* fix surface

* fix surface

* remove unused files

* fix heatmap with Intervals

* bring back nice errors, by introducing proper per plot convert targets

* fix plot

* fix tests

* reset runtests

* address review

* resurrect Grid and address last review comment

* fix surface

* fix tests

* less magic, clearer name

* fix remaining signatures, fix tests

* fix makie tests

* fix matrix_grid

* gotta remove flat surface from WGLMakie tests :(

* fix merge conflicts vscode didn't show
SimonDanisch added a commit that referenced this pull request Aug 8, 2022
@SimonDanisch
improve default axis type (#1935)
5f9ea57 
* don't use data_limits to figure out axis type (#1770)

* don't use data_limits to figure out axis type

* fix is2d

* fix tests

* fix heatmap

* fix remaining tests

* Update contours.jl

* fix comments

* fix 2d surfaces, add test (#1913)

* [breaking] clean up conversion pipeline (#1810)

* convert more orderly

* fix problems

* ok, we can't actually recursively convert

* the need for recursion

* fix conversions

* geometry improvements

* fix surface

* fix surface

* remove unused files

* fix heatmap with Intervals

* bring back nice errors, by introducing proper per plot convert targets

* fix plot

* fix tests

* reset runtests

* address review

* resurrect Grid and address last review comment

* fix surface

* fix tests

* less magic, clearer name

* fix remaining signatures, fix tests

* fix makie tests

* fix matrix_grid

* gotta remove flat surface from WGLMakie tests :(

* fix merge conflicts vscode didn't show
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@SimonDanisch @MakieBot