From 3739c2881bd22c3b4f4fb1788200efa9fea747a5 Mon Sep 17 00:00:00 2001 From: Thomas Breloff Date: Mon, 21 Sep 2015 16:18:58 -0400 Subject: [PATCH] fixed linetype aliases; for qwt as well --- src/args.jl | 6 +++++- src/backends/qwt.jl | 12 ++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/args.jl b/src/args.jl index 463838e4..86abdf0a 100644 --- a/src/args.jl +++ b/src/args.jl @@ -114,7 +114,7 @@ _plotDefaults[:xlabel] = "" _plotDefaults[:ylabel] = "" _plotDefaults[:yrightlabel] = "" _plotDefaults[:legend] = true -_plotDefaults[:background_color] = colorant"white" +_plotDefaults[:background_color] = RGB(0.1,0.1,0.1) # colorant"white" _plotDefaults[:xticks] = true _plotDefaults[:yticks] = true _plotDefaults[:size] = (800,600) @@ -298,6 +298,10 @@ function getSeriesArgs(pkg::PlottingPackage, initargs::Dict, kw, commandIndex::I d[k] = _seriesDefaults[k] end end + + if haskey(_typeAliases, d[:linetype]) + d[:linetype] = _typeAliases[d[:linetype]] + end aliasesAndAutopick(d, :axis, _axesAliases, supportedAxes(pkg), plotIndex) aliasesAndAutopick(d, :linestyle, _styleAliases, supportedStyles(pkg), plotIndex) diff --git a/src/backends/qwt.jl b/src/backends/qwt.jl index 3a025eb1..b97dd680 100644 --- a/src/backends/qwt.jl +++ b/src/backends/qwt.jl @@ -16,9 +16,16 @@ const _qwtAliases = Dict( :path => :line, ) +function replaceLinetypeAlias(d) + if haskey(_qwtAliases, d[:linetype]) + d[:linetype] = _qwtAliases[d[:linetype]] + end +end + function adjustQwtKeywords(iscreating::Bool; kw...) d = Dict(kw) - replaceAliases!(d, _qwtAliases) + # replaceAliases!(d, _qwtAliases) + replaceLinetypeAlias(d) # if !iscreating # d[:heatmap_n] = d[:nbins] # end @@ -41,7 +48,8 @@ end function plot(pkg::QwtPackage; kw...) d = Dict(kw) - replaceAliases!(d, _qwtAliases) + # replaceAliases!(d, _qwtAliases) + replaceLinetypeAlias(d) # d = adjustQwtKeywords(true; kw...) o = Qwt.plot(zeros(0,0); d..., show=false) plt = Plot(o, pkg, 0, d, Dict[])