From 3288e742bb4765e114acfb4590b0f0a664bd330f Mon Sep 17 00:00:00 2001 From: Simon Christ Date: Sat, 12 Jun 2021 11:43:29 +0200 Subject: [PATCH] add methods for matrices of annotations --- src/components.jl | 6 ++++++ test/test_components.jl | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/components.jl b/src/components.jl index 51914ffa..63be7b15 100644 --- a/src/components.jl +++ b/src/components.jl @@ -474,6 +474,11 @@ mutable struct SeriesAnnotations baseshape::Union{Shape, AbstractVector{Shape}, Nothing} scalefactor::Tuple end + +series_annotations(scalar) = series_annotations([scalar]) +function series_annotations(anns::AMat) + map(series_annotations, anns) +end function series_annotations(strs::AbstractVector, args...) fnt = font() shp = nothing @@ -570,6 +575,7 @@ end annotations(::Nothing) = [] annotations(anns::AVec) = anns +annotations(anns::AMat) = map(annotations, anns) annotations(anns) = Any[anns] annotations(sa::SeriesAnnotations) = sa diff --git a/test/test_components.jl b/test/test_components.jl index 7e2ed669..ce616075 100644 --- a/test/test_components.jl +++ b/test/test_components.jl @@ -141,11 +141,11 @@ end layout = (5, 1), ylims = (-1.1, 1.1), xlims = (0, 5), - series_annotations = ["1/1" "1/2" "1/3" "1/4" "1/5"], + series_annotations = permutedims([["1/1"],["1/2"],["1/3"],["1/4"],["1/5"]]), ) - @test spl.series_list[1].plotattrubtes[:series_annotations].strs == ["1/1"] - @test spl.series_list[2].plotattrubtes[:series_annotations].strs == ["1/2"] - @test spl.series_list[3].plotattrubtes[:series_annotations].strs == ["1/3"] - @test spl.series_list[4].plotattrubtes[:series_annotations].strs == ["1/4"] - @test spl.series_list[5].plotattrubtes[:series_annotations].strs == ["1/5"] + @test spl.series_list[1].plotattributes[:series_annotations].strs == ["1/1"] + @test spl.series_list[2].plotattributes[:series_annotations].strs == ["1/2"] + @test spl.series_list[3].plotattributes[:series_annotations].strs == ["1/3"] + @test spl.series_list[4].plotattributes[:series_annotations].strs == ["1/4"] + @test spl.series_list[5].plotattributes[:series_annotations].strs == ["1/5"] end