added skinny markers + and x; closes #436
This commit is contained in:
parent
f8fddb49e2
commit
9db7de8373
@ -123,9 +123,9 @@ const _markerAliases = Dict{Symbol,Symbol}(
|
|||||||
:dtri => :dtriangle,
|
:dtri => :dtriangle,
|
||||||
:downtri => :dtriangle,
|
:downtri => :dtriangle,
|
||||||
:downtriangle => :dtriangle,
|
:downtriangle => :dtriangle,
|
||||||
:+ => :cross,
|
# :+ => :cross,
|
||||||
:plus => :cross,
|
:plus => :cross,
|
||||||
:x => :xcross,
|
# :x => :xcross,
|
||||||
:X => :xcross,
|
:X => :xcross,
|
||||||
:star => :star5,
|
:star => :star5,
|
||||||
:s => :star5,
|
:s => :star5,
|
||||||
|
|||||||
@ -80,6 +80,8 @@ const _gl_marker_map = KW(
|
|||||||
:hexagon => '⬢',
|
:hexagon => '⬢',
|
||||||
:cross => '✚',
|
:cross => '✚',
|
||||||
:xcross => '❌',
|
:xcross => '❌',
|
||||||
|
:+ => '✚',
|
||||||
|
:x => '❌',
|
||||||
:utriangle => '▲',
|
:utriangle => '▲',
|
||||||
:dtriangle => '▼',
|
:dtriangle => '▼',
|
||||||
:pentagon => '⬟',
|
:pentagon => '⬟',
|
||||||
|
|||||||
@ -74,6 +74,8 @@ const gr_markertype = KW(
|
|||||||
:octagon => -24,
|
:octagon => -24,
|
||||||
:cross => 2,
|
:cross => 2,
|
||||||
:xcross => 5,
|
:xcross => 5,
|
||||||
|
:+ => 2,
|
||||||
|
:x => 5,
|
||||||
:star4 => -25,
|
:star4 => -25,
|
||||||
:star5 => -26,
|
:star5 => -26,
|
||||||
:star6 => -27,
|
:star6 => -27,
|
||||||
|
|||||||
@ -64,6 +64,8 @@ const _pgfplots_markers = KW(
|
|||||||
:none => "none",
|
:none => "none",
|
||||||
:cross => "+",
|
:cross => "+",
|
||||||
:xcross => "x",
|
:xcross => "x",
|
||||||
|
:+ => "+",
|
||||||
|
:x => "x",
|
||||||
:utriangle => "triangle*",
|
:utriangle => "triangle*",
|
||||||
:dtriangle => "triangle*",
|
:dtriangle => "triangle*",
|
||||||
:circle => "*",
|
:circle => "*",
|
||||||
|
|||||||
@ -307,6 +307,7 @@ plotly_colorscale(c, α) = plotly_colorscale(cgrad(alpha=α), α)
|
|||||||
const _plotly_markers = KW(
|
const _plotly_markers = KW(
|
||||||
:rect => "square",
|
:rect => "square",
|
||||||
:xcross => "x",
|
:xcross => "x",
|
||||||
|
:x => "x",
|
||||||
:utriangle => "triangle-up",
|
:utriangle => "triangle-up",
|
||||||
:dtriangle => "triangle-down",
|
:dtriangle => "triangle-down",
|
||||||
:star5 => "star-triangle-up",
|
:star5 => "star-triangle-up",
|
||||||
|
|||||||
@ -174,8 +174,8 @@ function py_marker(marker::Symbol)
|
|||||||
marker == :diamond && return "D"
|
marker == :diamond && return "D"
|
||||||
marker == :utriangle && return "^"
|
marker == :utriangle && return "^"
|
||||||
marker == :dtriangle && return "v"
|
marker == :dtriangle && return "v"
|
||||||
# marker == :cross && return "+"
|
marker == :+ && return "+"
|
||||||
# marker == :xcross && return "x"
|
marker == :x && return "x"
|
||||||
marker == :star5 && return "*"
|
marker == :star5 && return "*"
|
||||||
marker == :pentagon && return "p"
|
marker == :pentagon && return "p"
|
||||||
marker == :hexagon && return "h"
|
marker == :hexagon && return "h"
|
||||||
|
|||||||
@ -119,6 +119,8 @@ const _shape_keys = Symbol[
|
|||||||
:star8,
|
:star8,
|
||||||
:vline,
|
:vline,
|
||||||
:hline,
|
:hline,
|
||||||
|
:+,
|
||||||
|
:x,
|
||||||
]
|
]
|
||||||
|
|
||||||
const _shapes = KW(
|
const _shapes = KW(
|
||||||
|
|||||||
@ -252,7 +252,7 @@ PlotExample("DataFrames",
|
|||||||
iris = RDatasets.dataset("datasets", "iris")
|
iris = RDatasets.dataset("datasets", "iris")
|
||||||
scatter(iris, :SepalLength, :SepalWidth, group=:Species,
|
scatter(iris, :SepalLength, :SepalWidth, group=:Species,
|
||||||
title = "My awesome plot", xlabel = "Length", ylabel = "Width",
|
title = "My awesome plot", xlabel = "Length", ylabel = "Width",
|
||||||
marker = (0.5, [:+ :h :star7], 12), bg=RGB(.2,.2,.2))
|
marker = (0.5, [:cross :hex :star7], 12), bg=RGB(.2,.2,.2))
|
||||||
end)]
|
end)]
|
||||||
),
|
),
|
||||||
|
|
||||||
|
|||||||
@ -45,7 +45,7 @@ function image_comparison_tests(pkg::Symbol, idx::Int; debug = false, popup = is
|
|||||||
# firgure out version info
|
# firgure out version info
|
||||||
G = glob(joinpath(relpath(refdir), "*"))
|
G = glob(joinpath(relpath(refdir), "*"))
|
||||||
# @show refdir fn G
|
# @show refdir fn G
|
||||||
slash = (@windows ? "\\" : "/")
|
slash = (@static is_windows() ? "\\" : "/")
|
||||||
versions = map(fn -> VersionNumber(split(fn, slash)[end]), G)
|
versions = map(fn -> VersionNumber(split(fn, slash)[end]), G)
|
||||||
versions = reverse(sort(versions))
|
versions = reverse(sort(versions))
|
||||||
versions = filter(v -> v <= _current_plots_version, versions)
|
versions = filter(v -> v <= _current_plots_version, versions)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user