Added missing marker shapes

This commit is contained in:
Josef Heinen 2016-03-05 12:16:18 +01:00
parent d08672aa71
commit e342805752
2 changed files with 5 additions and 3 deletions

View File

@ -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)

View File

@ -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