From e14733d46017f2318621885f99e16fc70b95f286 Mon Sep 17 00:00:00 2001 From: Simon Christ Date: Tue, 19 Nov 2019 18:18:08 +0100 Subject: [PATCH] ltriangle, rtriangle --- src/backends.jl | 3 +-- src/backends/pgfplotsx.jl | 12 +++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/backends.jl b/src/backends.jl index 89fa83eb..d2ae4894 100644 --- a/src/backends.jl +++ b/src/backends.jl @@ -713,7 +713,6 @@ const _pgfplotsx_attr = merge_with_base_supported([ # ] const _pgfplotsx_seriestype = [:path, :path3d, :scatter, :steppre, :stepmid, :steppost, :histogram2d, :ysticks, :xsticks, :contour, :shape, :straightline,] const _pgfplotsx_style = [:auto, :solid, :dash, :dot, :dashdot, :dashdotdot] -const _pgfplotsx_marker = vcat(_allMarkers, Shape) - # [:none, :auto, :circle, :rect, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star5, :pentagon, :hline, :vline] # +const _pgfplotsx_marker = [:none, :auto, :circle, :rect, :diamond, :utriangle, :dtriangle, :ltriangle, :rtriangle, :cross, :xcross, :star5, :pentagon, :hline, :vline, Shape] const _pgfplotsx_scale = [:identity, :ln, :log2, :log10] is_marker_supported(::PGFPlotsXBackend, shape::Shape) = true diff --git a/src/backends/pgfplotsx.jl b/src/backends/pgfplotsx.jl index 46c90cbc..1d2c3587 100644 --- a/src/backends/pgfplotsx.jl +++ b/src/backends/pgfplotsx.jl @@ -16,6 +16,8 @@ const _pgfplotsx_markers = KW( :x => "x", :utriangle => "triangle*", :dtriangle => "triangle*", + :rtriangle => "triangle*", + :ltriangle => "triangle*", :circle => "*", :rect => "square*", :star5 => "star", @@ -125,7 +127,15 @@ function pgfx_marker(plotattributes, i = 1) "fill" => cstr, "fill opacity" => a, "line width" => pgfx_thickness_scaling(plotattributes) * _cycle(plotattributes[:markerstrokewidth], i), - "rotate" => (shape == :dtriangle ? 180 : 0), + "rotate" => if shape == :dtriangle + 180 + elseif shape == :rtriangle + 270 + elseif shape == :ltriangle + 90 + else + 0 + end, get(_pgfplotsx_linestyles, _cycle(plotattributes[:markerstrokestyle], i), "solid") => nothing ) )