From e342805752a53e81936f1e18025abff27081ebfd Mon Sep 17 00:00:00 2001 From: Josef Heinen Date: Sat, 5 Mar 2016 12:16:18 +0100 Subject: [PATCH] Added missing marker shapes --- src/backends/gr.jl | 6 ++++-- src/backends/supported.jl | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/backends/gr.jl b/src/backends/gr.jl index 22177f2c..4f5a05c0 100644 --- a/src/backends/gr.jl +++ b/src/backends/gr.jl @@ -16,8 +16,10 @@ const gr_linetype = Dict( const gr_markertype = Dict( :auto => 1, :none => -1, :ellipse => -1, :rect => -7, :diamond => -13, - :utriangle => -3, :dtriangle => -5, :pentagon => -14, :hexagon => 3, - :cross => 2, :xcross => 5, :star5 => 3 ) + :utriangle => -3, :dtriangle => -5, :pentagon => -21, :hexagon => -22, + :heptagon => -23, :octagon => -24, :cross => 2, :xcross => 5, + :hline => -1, :vline => -1, + :star4 => -25, :star5 => -26, :star6 => -27, :star7 => -28, :star8 => -29 ) const gr_halign = Dict(:left => 1, :hcenter => 2, :right => 3) const gr_valign = Dict(:top => 1, :vcenter => 3, :bottom => 5) diff --git a/src/backends/supported.jl b/src/backends/supported.jl index a647a079..0709b1fa 100644 --- a/src/backends/supported.jl +++ b/src/backends/supported.jl @@ -241,7 +241,7 @@ supportedTypes(::GRPackage) = [:none, :line, :path, :steppre, :steppost, :sticks :hline, :vline, :contour, :path3d, :scatter3d, :surface, :wireframe, :ohlc, :pie] supportedStyles(::GRPackage) = [:auto, :solid, :dash, :dot, :dashdot] -supportedMarkers(::GRPackage) = vcat([:none, :ellipse, :rect, :diamond, :utriangle, :dtriangle, :pentagon, :hexagon, :cross, :xcross, :star5], Shape) +supportedMarkers(::GRPackage) = vcat(_allMarkers, Shape) supportedScales(::GRPackage) = [:identity, :log10] subplotSupported(::GRPackage) = true