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

Add "userdata" attribute for unvalidated attributes #3764

Draft
wants to merge 25 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
f92799f
run CI against this PR
SimonDanisch Feb 23, 2024
b076968
bump version
SimonDanisch Feb 23, 2024
04d4863
fix circular reference
SimonDanisch Feb 23, 2024
b723a07
remove GeoInterfaceMakie tests for good to avoid circular dependencies
SimonDanisch Feb 23, 2024
411d22e
add poly1
SimonDanisch Feb 23, 2024
d0b423c
Merge branch 'master' into breaking-0.21
SimonDanisch Feb 27, 2024
3f885c3
Rework line shaders for WGLMakie compatability (#3558)
ffreyer Feb 27, 2024
d108cbd
fix line inversion (#3651)
ffreyer Mar 5, 2024
9d10308
Merge branch 'master' into breaking-0.21
SimonDanisch Mar 5, 2024
51da2c6
Documented / validated plot attributes (#3626)
jkrumbiegel Mar 5, 2024
3b9de64
Merge branch 'master' into breaking-0.21
SimonDanisch Mar 7, 2024
6681722
Merge branch 'master' into breaking-0.21
SimonDanisch Mar 7, 2024
274df26
Add voxel plot type (#3527)
ffreyer Mar 8, 2024
2176f0f
implement Float32 without losing Float64 precision (rebased) (#3681)
SimonDanisch Mar 18, 2024
67ebcf2
Document conversion pipeline (#3719)
ffreyer Mar 20, 2024
4434fef
Deprecate `rotations` for `rotation` for Scatter and MeshScatter (#3724)
jkrumbiegel Mar 25, 2024
5a3bae4
Merge branch 'master' into breaking-0.21
ffreyer Mar 25, 2024
82c65b2
fix merge
ffreyer Mar 25, 2024
0a3b8d4
update scatter boundingbox (#3716)
ffreyer Mar 26, 2024
cd340fd
Change how boundingbox(::Text) is deprecated (#3723)
ffreyer Mar 26, 2024
a28ebf9
Various fixes for next release (#3731)
ffreyer Mar 26, 2024
de952bc
Merge branch 'master' into breaking-0.21
ffreyer Mar 28, 2024
22a0a2d
fix NaN handling in limits & deprecate _update_rect
ffreyer Mar 28, 2024
f1d2cf3
add userdata attribute
ffreyer Apr 3, 2024
0641ef3
add mssing userdata
ffreyer Apr 3, 2024
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: 2 additions & 0 deletions .github/workflows/Docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@ on:
pull_request:
branches:
- master
- breaking-0.21
push:
tags:
- '*'
branches:
- master
- breaking-0.21

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ on:
- '*.md'
branches:
- master
- breaking-0.21
push:
tags:
- '*'
branches:
- master
- breaking-0.21

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/compilation-benchmark.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
- '*.md'
branches:
- master
- breaking-0.21
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true
Expand Down
14 changes: 8 additions & 6 deletions .github/workflows/reference_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ on:
- '*.md'
branches:
- master
- breaking-0.21
push:
tags:
- '*'
branches:
- master
- breaking-0.21

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
Expand Down Expand Up @@ -179,28 +181,28 @@ jobs:
- name: Consolidate reference image folders
run: |
baseDir="./ReferenceImages"

# Create new top-level directory for combined files
mkdir -p "./ReferenceImagesCombined"

# Copy the reference folder from GLMakie, it's the same for all backends
cp -r "${baseDir}/GLMakie/reference/." "./ReferenceImagesCombined/reference/"

# Initialize empty files for concatenation
> "./ReferenceImagesCombined/scores.tsv"
> "./ReferenceImagesCombined/new_files.txt"

# Loop through the directories and concatenate the files, and copy recorded folders
for dir in WGLMakie CairoMakie GLMakie; do
# Concatenate scores.tsv and new_files.txt
cat "${baseDir}/${dir}/scores.tsv" >> "./ReferenceImagesCombined/scores.tsv"
cat "${baseDir}/${dir}/new_files.txt" >> "./ReferenceImagesCombined/new_files.txt"

# Copy recorded folder
mkdir -p "./ReferenceImagesCombined/recorded/${dir}/"
cp -r "${baseDir}/${dir}/recorded/${dir}/." "./ReferenceImagesCombined/recorded/${dir}/"
done

echo "Files and folders have been successfully combined into ReferenceImagesCombined."
- uses: actions/upload-artifact@v4
with:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/relocatability.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ on:
- '*.md'
branches:
- master
- breaking-0.21
push:
tags:
- '*'
branches:
- master
- breaking-0.21

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/rprmakie.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ on:
- '*.md'
branches:
- master
- breaking-0.21
push:
tags:
- '*'
branches:
- master
- breaking-0.21

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
Expand Down
24 changes: 23 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,32 @@
# Changelog

## [Unreleased]
## [0.21.0] - 2024-03-0X

- Add `voxels` plot [#3527](https://github.com/MakieOrg/Makie.jl/pull/3527)
- Added supported markers hint to unsupported marker warn message [#3666](https://github.com/MakieOrg/Makie.jl/pull/3666).
- Fixed bug in CairoMakie line drawing when multiple successive points had the same color [#3712](https://github.com/MakieOrg/Makie.jl/pull/3712).
- Remove StableHashTraits in favor of calculating hashes directly with CRC32c [#3667](https://github.com/MakieOrg/Makie.jl/pull/3667).
- **Breaking (sort of)** Added a new `@recipe` variant which allows documenting attributes directly where they are defined and validating that all attributes are known whenever a plot is created. This is not breaking in the sense that the API changes, but user code is likely to break because of misspelled attribute names etc. that have so far gone unnoticed.
- **Breaking** Streamlined `data_limits` and `boundingbox` [#3671](https://github.com/MakieOrg/Makie.jl/pull/3671)
- `data_limits` now only considers plot positions, completely ignoring transformations
- `boundingbox(p::Text)` is deprecated in favor of `boundingbox(p::Text, p.markerspace[])`. The more internal methods use `string_boundingbox(p)`. [#3723](https://github.com/MakieOrg/Makie.jl/pull/3723)
- `boundingbox` overwrites must now include a secondary space argument to work `boundingbox(plot, space::Symbol = :data)` [#3723](https://github.com/MakieOrg/Makie.jl/pull/3723)
- `boundingbox` now always consider `transform_func` and `model` (except for Text for the time being)
- `data_limits(::Scatter)` and `boundingbox(::Scatter)` now consider marker transformations [#3716](https://github.com/MakieOrg/Makie.jl/pull/3716)
- **Breaking** Improved Float64 compatability of Axis [#3681](https://github.com/MakieOrg/Makie.jl/pull/3681)
- This added an extra conversion step which only takes effect when Float32 precision becomes relevant. In those cases code using `project()` functions will be wrong as the transformation is not applied. Use `project(plot_or_scene, ...)` or apply the conversion yourself beforehand with `Makie.f32_convert(plot_or_scene, transformed_point)` and use `patched_model = Makie.patch_model(plot_or_scene, model)`.
- `Makie.to_world(point, matrix, resolution)` has been deprecated in favor of `Makie.to_world(scene_or_plot, point)` to include float32 conversions.
- **Breaking** Reworked line shaders in GLMakie and WGLMakie [#3558](https://github.com/MakieOrg/Makie.jl/pull/3558)
- GLMakie: Removed support for per point linewidths
- GLMakie: Adjusted dots (e.g. with `linestyle = :dot`) to bend across a joint
- GLMakie: Adjusted linestyles to scale with linewidth dynamically so that dots remain dots with changing linewidth
- GLMakie: Cleaned up anti-aliasing for truncated joints
- WGLMakie: Added support for linestyles
- WGLMakie: Added line joints
- WGLMakie: Added native anti-aliasing which generally improves quality but introduces outline artifacts in some cases (same as GLMakie)
- Both: Adjusted handling of thin lines which may result in different color intensities
- Fixed an issue with lines being drawn in the wrong direction in 3D (with perspective projection) [#3651](https://github.com/MakieOrg/Makie.jl/pull/3651).
- **Breaking** Renamed attribute `rotations` to `rotation` for `scatter` and `meshscatter` which had been inconsistent with the otherwise singular naming scheme and other plots like `text` [#3724](https://github.com/MakieOrg/Makie.jl/pull/3724).
- Fixed `contourf` bug where n levels would sometimes miss the uppermost value, causing gaps [#3713](https://github.com/MakieOrg/Makie.jl/pull/3713).
- Added `scale` attribute to `violin` [#3352](https://github.com/MakieOrg/Makie.jl/pull/3352).
- Use label formatter in barplot [#3718](https://github.com/MakieOrg/Makie.jl/pull/3718).
Expand Down
4 changes: 2 additions & 2 deletions CairoMakie/Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "CairoMakie"
uuid = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
author = ["Simon Danisch <sdanisch@gmail.com>"]
version = "0.11.9"
version = "0.12.0"

[deps]
CRC32c = "8bf52ea8-c179-5cab-976a-9e18b702a9bc"
Expand All @@ -24,7 +24,7 @@ FileIO = "1.1"
FreeType = "3, 4.0"
GeometryBasics = "0.4.1"
LinearAlgebra = "1.0, 1.6"
Makie = "=0.20.8"
Makie = "=0.21.0"
PrecompileTools = "1.0"
julia = "1.3"

Expand Down
1 change: 1 addition & 0 deletions CairoMakie/src/CairoMakie.jl
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ using Makie: to_value, to_colormap, extrema_nan
using Makie.Observables
using Makie: spaces, is_data_space, is_pixel_space, is_relative_space, is_clip_space
using Makie: numbers_to_colors
using Makie: Mat3f, Mat4f, Mat3d, Mat4d

# re-export Makie, including deprecated names
for name in names(Makie, all=true)
Expand Down
Loading
Loading