call Gadfly.get_stroke_vector; added getindex/setindex to qwt
This commit is contained in:
parent
a0a0773bd2
commit
d4da910f19
File diff suppressed because one or more lines are too long
@ -90,17 +90,17 @@ function addGadflyFixedLines!(gplt, d::Dict, theme)
|
|||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
function getGadflyStrokeVector(linestyle::Symbol)
|
# function getGadflyStrokeVector(linestyle::Symbol)
|
||||||
dash = 12 * Compose.mm
|
# dash = 12 * Compose.mm
|
||||||
dot = 3 * Compose.mm
|
# dot = 3 * Compose.mm
|
||||||
gap = 2 * Compose.mm
|
# gap = 2 * Compose.mm
|
||||||
linestyle == :solid && return nothing
|
# linestyle == :solid && return nothing
|
||||||
linestyle == :dash && return [dash, gap]
|
# linestyle == :dash && return [dash, gap]
|
||||||
linestyle == :dot && return [dot, gap]
|
# linestyle == :dot && return [dot, gap]
|
||||||
linestyle == :dashdot && return [dash, gap, dot, gap]
|
# linestyle == :dashdot && return [dash, gap, dot, gap]
|
||||||
linestyle == :dashdotdot && return [dash, gap, dot, gap, dot, gap]
|
# linestyle == :dashdotdot && return [dash, gap, dot, gap, dot, gap]
|
||||||
error("unsupported linestyle: ", linestyle)
|
# error("unsupported linestyle: ", linestyle)
|
||||||
end
|
# end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -111,8 +111,8 @@ function addGadflySeries!(gplt, d::Dict, initargs::Dict)
|
|||||||
# if my PR isn't present, don't set the line_style
|
# if my PR isn't present, don't set the line_style
|
||||||
local extra_theme_args
|
local extra_theme_args
|
||||||
try
|
try
|
||||||
Gadfly.getStrokeVector(:solid)
|
extra_theme_args = [(:line_style, Gadfly.get_stroke_vector(d[:linestyle]))]
|
||||||
extra_theme_args = [(:line_style, getGadflyStrokeVector(d[:linestyle]))]
|
# extra_theme_args = [(:line_style, getGadflyStrokeVector(d[:linestyle]))]
|
||||||
catch
|
catch
|
||||||
extra_theme_args = []
|
extra_theme_args = []
|
||||||
end
|
end
|
||||||
|
|||||||
@ -63,6 +63,24 @@ function updatePlotItems(plt::Plot{QwtPackage}, d::Dict)
|
|||||||
haskey(d, :ylabel) && Qwt.ylabel(plt.o, d[:ylabel])
|
haskey(d, :ylabel) && Qwt.ylabel(plt.o, d[:ylabel])
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# ----------------------------------------------------------------
|
||||||
|
|
||||||
|
# accessors for x/y data
|
||||||
|
|
||||||
|
function Base.getindex(plt::Plot{QwtPackage}, i::Int)
|
||||||
|
series = plt.o.lines[i]
|
||||||
|
series.x, series.y
|
||||||
|
end
|
||||||
|
|
||||||
|
function Base.setindex!(plt::Plot{QwtPackage}, xy::Tuple, i::Integer)
|
||||||
|
series = plt.o.lines[i]
|
||||||
|
series.x, series.y = xy
|
||||||
|
plt
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
# -------------------------------
|
# -------------------------------
|
||||||
|
|
||||||
# savepng(::QwtPackage, plt::PlottingObject, fn::AbstractString, args...) = Qwt.savepng(plt.o, fn)
|
# savepng(::QwtPackage, plt::PlottingObject, fn::AbstractString, args...) = Qwt.savepng(plt.o, fn)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user