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.

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

breaking-release combined #2220

Closed
wants to merge 51 commits into from
Closed

breaking-release combined #2220

wants to merge 51 commits into from

Conversation

SimonDanisch
Copy link
Member

Combines the changes from #1918 #2056 and #2046 to put a stop to rebase hell.
Will replace #1918, but doesn't yet as long as tests aren't passing.

SimonDanisch and others added 30 commits July 20, 2022 00:26
* don't use data_limits to figure out axis type

* fix is2d

* fix tests

* fix heatmap

* fix remaining tests

* Update contours.jl

* fix comments
* 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
* 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
* 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

* clean up attribute code / easier compilation

* qualify AbstractObservable

* speed improvements

* 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

* 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

* remove some boxes

fix merge

fix contourf
get benchmark going
* don't use data_limits to figure out axis type

* fix is2d

* fix tests

* fix heatmap

* fix remaining tests

* Update contours.jl

* fix comments
* 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
* 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
* 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

* clean up attribute code / easier compilation

* qualify AbstractObservable

* speed improvements

* 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

* 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

* remove some boxes

fix merge

fix contourf
@SimonDanisch
Copy link
Member Author

@SimonDanisch SimonDanisch mentioned this pull request Aug 1, 2023
16 tasks
SimonDanisch added a commit that referenced this pull request Nov 17, 2023
Continues #2831 !
Still needs to check, if I rebased correctly and didn't incorrectly
apply some of the changes!

## Merged PRs
- #2598
- #2746
- #2346
- #2544
- #3082
- #2868
- #3062
- #3106
- #3281
- #3246

## TODOS

- [x] fix flaky test `@test GLMakie.window_size(screen.glscreen) ==
scaled(screen, (W, H))`
- [x] Merge axis type inferences from #2220 
- [x] Test on different resolution screens, IJulia, Pluto, VSCode,
Windowed
- [x] rebase to only have merge commits from the PRs 
- [x] investigate unexpected speed ups
- [x] reset camera settings from tests
- [ ] check doc image generation
- [x] rethink default near/far in Camera3D (compatability with OIT)
- [x] merge #3246
- [x] fix WGLMakie issues/tests:
- [x] fix line depth issues (see tests: ~~hexbin colorrange~~ (not new),
LaTeXStrings in Axis3, Axis3 axis reversal)
  - [x] fix lighting of surface with nan points (fixed in #3246)
- ~~volume/3D contour artifacts (see 3D Contour with 2D contour
slices)~~ not new
  - ~~artifacting in "colorscale (lines)"~~ not new
- [x] GLMakie:
  - [x] slight outline in "scatter image markers" test
  - ~~clipping/z-fighting in "volume translated"~~ not new
- [x] CairoMakie:
  -  ~~Artfiacting in `colorscale (lines)"~~ not new
  - ~~markersize in "scatter rotations" changed?~~ not new
  - ~~color change in "colorscale (poly)"~~ not new
  - ~~transparency/render order of "OldAxis + Surface"~~ not new
  - ~~render order in "Merged color mesh"~~ not new
  - ~~render order of "Surface + wireframe + contour"~~ not new
- [x] Check "SpecApi in convert_arguments" (colors swapped?)


## Fixes the following errors

- fixes #2721 via #2746
- fixes #1600 via #2746
- fixes #1236 via #2746
- fixes MakieOrg/GeoMakie.jl#133 via #2598
- closes #2522
- closes #3239 via #3246
- fixes #3238 via #3246
- fixes #2985 via #3246
- fixes #3307 via #3281
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants