mantao/Plots.jl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added primary kw for series counting; added sticks recipe; gr_set_font and related fixes

Browse Source
This commit is contained in:
Thomas Breloff 2016-06-06 23:43:06 -04:00
parent 8d8ac10429
commit 6bfa31a89f
4 changed files with 130 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/args.jl
View File

@ -179,6 +179,8 @@ const _series_defaults = KW(
# this ONLY effects whether or not the z-matrix is transposed for a heatmap display! # this ONLY effects whether or not the z-matrix is transposed for a heatmap display!
:subplot => :auto, # which subplot(s) does this series belong to? :subplot => :auto, # which subplot(s) does this series belong to?
:series_annotations => [], # a list of annotations which apply to the coordinates of this series :series_annotations => [], # a list of annotations which apply to the coordinates of this series
:primary => true, # when true, this "counts" as a series for color selection, etc. the main use is to allow
# one logical series to be broken up (path and markers, for example)
) )
@ -250,6 +252,7 @@ const _suppress_warnings = Set{Symbol}([
:series_plotindex, :series_plotindex,
:link, :link,
:plot_object, :plot_object,
:primary,
]) ])
# add defaults for the letter versions # add defaults for the letter versions

117
src/backends/gr.jl
View File

@ -42,7 +42,7 @@ supportedTypes(::GRBackend) = [
:path, #:steppre, :steppost, :path, #:steppre, :steppost,
:scatter, :scatter,
#:histogram2d, :hexbin, #:histogram2d, :hexbin,
:sticks, # :sticks,
# :hline, :vline, # :hline, :vline,
:heatmap, :pie, :image, :heatmap, :pie, :image,
:contour, :path3d, :scatter3d, :surface, :wireframe, :contour, :path3d, :scatter3d, :surface, :wireframe,
@ -369,6 +369,21 @@ function gr_set_fill(c)
GR.setfillintstyle(GR.INTSTYLE_SOLID) GR.setfillintstyle(GR.INTSTYLE_SOLID)
end end
# this stores the conversion from a font pointsize to "percentage of window height" which is what GR uses
const _gr_point_mult = zeros(1)
# set the font attributes... assumes _gr_point_mult has been populated already
function gr_set_font(f::Font)
family = lowercase(f.family)
GR.setcharheight(_gr_point_mult[1] * f.pointsize)
GR.setcharup(sin(f.rotation), cos(f.rotation))
if haskey(gr_font_family, family)
GR.settextfontprec(100 + gr_font_family[family], GR.TEXT_PRECISION_STRING)
end
GR.settextcolorind(gr_getcolorind(f.color))
GR.settextalign(gr_halign[f.halign], gr_valign[f.valign])
end
# -------------------------------------------------------------------------------------- # --------------------------------------------------------------------------------------
# # convert a bounding box from absolute coords to percentages... # # convert a bounding box from absolute coords to percentages...
@ -430,6 +445,10 @@ function gr_display(plt::Plot)
gr_fill_viewport(viewport_canvas, plt[:background_color_outside]) gr_fill_viewport(viewport_canvas, plt[:background_color_outside])
# @show "PLOT SETUP" plt.layout.bbox ratio viewport_canvas # @show "PLOT SETUP" plt.layout.bbox ratio viewport_canvas
# update point mult
px_per_pt = px / pt
_gr_point_mult[1] = px_per_pt / h
# subplots: # subplots:
for sp in plt.subplots for sp in plt.subplots
gr_display(sp, w*px, h*px, viewport_canvas) gr_display(sp, w*px, h*px, viewport_canvas)
@ -451,6 +470,12 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
# # # # c = getColor(d[:background_color_inside]) # # # # c = getColor(d[:background_color_inside])
dark_bg = 0.21 * bg.r + 0.72 * bg.g + 0.07 * bg.b < 0.9 dark_bg = 0.21 * bg.r + 0.72 * bg.g + 0.07 * bg.b < 0.9
# # multiplier to convert a font's pointsize to GR's percentage of window height
# winheight_px = sp.plt[:size][2]
# px_per_pt = px / pt
# pointsize_mult = px_per_pt / winheight_px
# @show winheight_px px_per_pt pointsize_mult
# end # end
# #
# function gr_old_display(plt::Plot{GRBackend}, subplot=[0, 1, 0, 1]) # function gr_old_display(plt::Plot{GRBackend}, subplot=[0, 1, 0, 1])
@ -647,6 +672,8 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
# get(d, :xflip, false) && (scale |= GR.OPTION_FLIP_X) # get(d, :xflip, false) && (scale |= GR.OPTION_FLIP_X)
# get(d, :yflip, false) && (scale |= GR.OPTION_FLIP_Y) # get(d, :yflip, false) && (scale |= GR.OPTION_FLIP_Y)
window_diag = sqrt((viewport_plotarea[2] - viewport_plotarea[1])^2 + (viewport_plotarea[4] - viewport_plotarea[3])^2)
for axis_idx = 1:num_axes for axis_idx = 1:num_axes
xmin, xmax, ymin, ymax = extrema[axis_idx,:] xmin, xmax, ymin, ymax = extrema[axis_idx,:]
@ -654,7 +681,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
# NOTE: for log axes, the x_tick and y_tick - if non-zero (omit axes) - only affect the output appearance (1 = nomal, 2 = scientiic notation) # NOTE: for log axes, the x_tick and y_tick - if non-zero (omit axes) - only affect the output appearance (1 = nomal, 2 = scientiic notation)
if scale & GR.OPTION_X_LOG == 0 if scale & GR.OPTION_X_LOG == 0
# xmin, xmax = GR.adjustlimits(xmin, xmax) # xmin, xmax = GR.adjustlimits(xmin, xmax)
majorx = 5 majorx = 1 #5
xtick = GR.tick(xmin, xmax) / majorx xtick = GR.tick(xmin, xmax) / majorx
else else
# log axis # log axis
@ -664,7 +691,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
end end
if scale & GR.OPTION_Y_LOG == 0 if scale & GR.OPTION_Y_LOG == 0
# ymin, ymax = GR.adjustlimits(ymin, ymax) # ymin, ymax = GR.adjustlimits(ymin, ymax)
majory = 5 majory = 1 #5
ytick = GR.tick(ymin, ymax) / majory ytick = GR.tick(ymin, ymax) / majory
else else
# log axis # log axis
@ -689,16 +716,16 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
GR.setwindow(xmin, xmax, ymin, ymax) GR.setwindow(xmin, xmax, ymin, ymax)
GR.setscale(scale) GR.setscale(scale)
diag = sqrt((viewport_plotarea[2] - viewport_plotarea[1])^2 + (viewport_plotarea[4] - viewport_plotarea[3])^2) # window_diag = sqrt((viewport_plotarea[2] - viewport_plotarea[1])^2 + (viewport_plotarea[4] - viewport_plotarea[3])^2)
charheight = max(0.018 * diag, 0.01) # charheight = max(0.018 * window_diag, 0.01)
GR.setcharheight(charheight) # GR.setcharheight(charheight)
GR.settextcolorind(gr_getcolorind(xaxis[:foreground_color_text])) GR.settextcolorind(gr_getcolorind(xaxis[:foreground_color_text]))
if axes_2d if axes_2d
GR.setlinewidth(1) GR.setlinewidth(1)
# GR.setlinetype(GR.LINETYPE_DOTTED) # GR.setlinetype(GR.LINETYPE_DOTTED)
GR.setlinecolorind(gr_getcolorind(sp[:foreground_color_grid])) GR.setlinecolorind(gr_getcolorind(sp[:foreground_color_grid]))
ticksize = 0.0075 * diag ticksize = 0.0075 * window_diag
if outside_ticks if outside_ticks
ticksize = -ticksize ticksize = -ticksize
end end
@ -724,22 +751,30 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
end end
end end
# GR.setcharheight(pointsize_mult * sp[:titlefont].pointsize)
if sp[:title] != "" if sp[:title] != ""
GR.savestate() GR.savestate()
gr_set_font(sp[:titlefont])
GR.settextalign(GR.TEXT_HALIGN_CENTER, GR.TEXT_VALIGN_TOP) GR.settextalign(GR.TEXT_HALIGN_CENTER, GR.TEXT_VALIGN_TOP)
GR.settextcolorind(gr_getcolorind(sp[:foreground_color_title])) GR.settextcolorind(gr_getcolorind(sp[:foreground_color_title]))
GR.text(0.5 * (viewport_plotarea[1] + viewport_plotarea[2]), viewport_subplot[4], sp[:title]) GR.text(0.5 * (viewport_plotarea[1] + viewport_plotarea[2]), viewport_subplot[4], sp[:title])
GR.restorestate() GR.restorestate()
end end
# GR.setcharheight(pointsize_mult * xaxis[:guidefont].pointsize)
if xaxis[:guide] != "" if xaxis[:guide] != ""
GR.savestate() GR.savestate()
gr_set_font(xaxis[:guidefont])
GR.settextalign(GR.TEXT_HALIGN_CENTER, GR.TEXT_VALIGN_BOTTOM) GR.settextalign(GR.TEXT_HALIGN_CENTER, GR.TEXT_VALIGN_BOTTOM)
GR.settextcolorind(gr_getcolorind(xaxis[:foreground_color_guide])) GR.settextcolorind(gr_getcolorind(xaxis[:foreground_color_guide]))
GR.text(0.5 * (viewport_plotarea[1] + viewport_plotarea[2]), viewport_subplot[3], xaxis[:guide]) GR.text(0.5 * (viewport_plotarea[1] + viewport_plotarea[2]), viewport_subplot[3], xaxis[:guide])
GR.restorestate() GR.restorestate()
end end
# GR.setcharheight(pointsize_mult * yaxis[:guidefont].pointsize)
if yaxis[:guide] != "" if yaxis[:guide] != ""
GR.savestate() GR.savestate()
gr_set_font(yaxis[:guidefont])
GR.settextalign(GR.TEXT_HALIGN_CENTER, GR.TEXT_VALIGN_TOP) GR.settextalign(GR.TEXT_HALIGN_CENTER, GR.TEXT_VALIGN_TOP)
GR.setcharup(-1, 0) GR.setcharup(-1, 0)
GR.settextcolorind(gr_getcolorind(yaxis[:foreground_color_guide])) GR.settextcolorind(gr_getcolorind(yaxis[:foreground_color_guide]))
@ -755,6 +790,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
# GR.restorestate() # GR.restorestate()
# end # end
gr_set_font(xaxis[:tickfont])
GR.setcolormap(1000 + GR.COLORMAP_COOLWARM) GR.setcolormap(1000 + GR.COLORMAP_COOLWARM)
# legend = falses(length(plt.seriesargs)) # legend = falses(length(plt.seriesargs))
@ -778,7 +814,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
GR.savestate() GR.savestate()
xmin, xmax, ymin, ymax = extrema[gr_getaxisind(d),:] xmin, xmax, ymin, ymax = extrema[gr_getaxisind(d),:]
GR.setwindow(xmin, xmax, ymin, ymax) GR.setwindow(xmin, xmax, ymin, ymax)
if st in [:path, :sticks, :polar] if st in [:path, :polar]
GR.setlinetype(gr_linetype[d[:linestyle]]) GR.setlinetype(gr_linetype[d[:linestyle]])
GR.setlinewidth(d[:linewidth]) GR.setlinewidth(d[:linewidth])
GR.setlinecolorind(gr_getcolorind(d[:linecolor])) GR.setlinecolorind(gr_getcolorind(d[:linecolor]))
@ -868,13 +904,13 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
# end # end
# # legend[idx] = true # # legend[idx] = true
# TODO: use recipe # # TODO: use recipe
elseif st == :sticks # elseif st == :sticks
x, y = d[:x], d[:y] # x, y = d[:x], d[:y]
for i = 1:length(y) # for i = 1:length(y)
gr_polyline([x[i], x[i]], [ymin, y[i]]) # gr_polyline([x[i], x[i]], [ymin, y[i]])
end # end
# legend[idx] = true # # legend[idx] = true
elseif st == :scatter elseif st == :scatter
if d[:markershape] != :none && axes_2d if d[:markershape] != :none && axes_2d
@ -960,8 +996,8 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
# # zmin, zmax = gr_getzlims(d, 0, maximum(counts), false) # # zmin, zmax = gr_getzlims(d, 0, maximum(counts), false)
# zmin, zmax = gr_lims(zaxis, false, (0, maximum(counts))) # zmin, zmax = gr_lims(zaxis, false, (0, maximum(counts)))
# GR.setspace(zmin, zmax, 0, 90) # GR.setspace(zmin, zmax, 0, 90)
# diag = sqrt((viewport_plotarea[2] - viewport_plotarea[1])^2 + (viewport_plotarea[4] - viewport_plotarea[3])^2) # window_diag = sqrt((viewport_plotarea[2] - viewport_plotarea[1])^2 + (viewport_plotarea[4] - viewport_plotarea[3])^2)
# charheight = max(0.016 * diag, 0.01) # charheight = max(0.016 * window_diag, 0.01)
# GR.setcharheight(charheight) # GR.setcharheight(charheight)
# GR.colormap() # GR.colormap()
# GR.setviewport(viewport_plotarea[1], viewport_plotarea[2], viewport_plotarea[3], viewport_plotarea[4]) # GR.setviewport(viewport_plotarea[1], viewport_plotarea[2], viewport_plotarea[3], viewport_plotarea[4])
@ -982,9 +1018,9 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
GR.setwindow(xmin, xmax, zmin, zmax) GR.setwindow(xmin, xmax, zmin, zmax)
GR.cellarray(xmin, xmax, zmax, zmin, 1, length(l), l) GR.cellarray(xmin, xmax, zmax, zmin, 1, length(l), l)
ztick = 0.5 * GR.tick(zmin, zmax) ztick = 0.5 * GR.tick(zmin, zmax)
diag = sqrt((viewport_plotarea[2] - viewport_plotarea[1])^2 + (viewport_plotarea[4] - viewport_plotarea[3])^2) # window_diag = sqrt((viewport_plotarea[2] - viewport_plotarea[1])^2 + (viewport_plotarea[4] - viewport_plotarea[3])^2)
charheight = max(0.016 * diag, 0.01) # charheight = max(0.016 * window_diag, 0.01)
GR.setcharheight(charheight) # GR.setcharheight(charheight)
GR.axes(0, ztick, xmax, zmin, 0, 1, 0.005) GR.axes(0, ztick, xmax, zmin, 0, 1, 0.005)
GR.setviewport(viewport_plotarea[1], viewport_plotarea[2], viewport_plotarea[3], viewport_plotarea[4]) GR.setviewport(viewport_plotarea[1], viewport_plotarea[2], viewport_plotarea[3], viewport_plotarea[4])
@ -996,8 +1032,8 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
xtick = GR.tick(xmin, xmax) / 2 xtick = GR.tick(xmin, xmax) / 2
ytick = GR.tick(ymin, ymax) / 2 ytick = GR.tick(ymin, ymax) / 2
ztick = GR.tick(zmin, zmax) / 2 ztick = GR.tick(zmin, zmax) / 2
diag = sqrt((viewport_plotarea[2] - viewport_plotarea[1])^2 + (viewport_plotarea[4] - viewport_plotarea[3])^2) # window_diag = sqrt((viewport_plotarea[2] - viewport_plotarea[1])^2 + (viewport_plotarea[4] - viewport_plotarea[3])^2)
charheight = max(0.018 * diag, 0.01) # charheight = max(0.018 * window_diag, 0.01)
ticksize = 0.01 * (viewport_plotarea[2] - viewport_plotarea[1]) ticksize = 0.01 * (viewport_plotarea[2] - viewport_plotarea[1])
GR.setlinewidth(1) GR.setlinewidth(1)
if grid_flag if grid_flag
@ -1012,7 +1048,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
GR.surface(x, y, z, GR.OPTION_FILLED_MESH) GR.surface(x, y, z, GR.OPTION_FILLED_MESH)
end end
GR.setlinewidth(1) GR.setlinewidth(1)
GR.setcharheight(charheight) # GR.setcharheight(charheight)
GR.axes3d(xtick, 0, ztick, xmin, ymin, zmin, 2, 0, 2, -ticksize) GR.axes3d(xtick, 0, ztick, xmin, ymin, zmin, 2, 0, 2, -ticksize)
GR.axes3d(0, ytick, 0, xmax, ymin, zmin, 0, 2, 0, ticksize) GR.axes3d(0, ytick, 0, xmax, ymin, zmin, 0, 2, 0, ticksize)
if cmap if cmap
@ -1041,8 +1077,8 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
xtick = GR.tick(xmin, xmax) / 2 xtick = GR.tick(xmin, xmax) / 2
ytick = GR.tick(ymin, ymax) / 2 ytick = GR.tick(ymin, ymax) / 2
ztick = GR.tick(zmin, zmax) / 2 ztick = GR.tick(zmin, zmax) / 2
diag = sqrt((viewport_plotarea[2] - viewport_plotarea[1])^2 + (viewport_plotarea[4] - viewport_plotarea[3])^2) # window_diag = sqrt((viewport_plotarea[2] - viewport_plotarea[1])^2 + (viewport_plotarea[4] - viewport_plotarea[3])^2)
charheight = max(0.018 * diag, 0.01) # charheight = max(0.018 * window_diag, 0.01)
ticksize = 0.01 * (viewport_plotarea[2] - viewport_plotarea[1]) ticksize = 0.01 * (viewport_plotarea[2] - viewport_plotarea[1])
GR.setlinewidth(1) GR.setlinewidth(1)
if grid_flag && st == :path3d if grid_flag && st == :path3d
@ -1063,7 +1099,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
end end
end end
GR.setlinewidth(1) GR.setlinewidth(1)
GR.setcharheight(charheight) # GR.setcharheight(charheight)
GR.axes3d(xtick, 0, ztick, xmin, ymin, zmin, 2, 0, 2, -ticksize) GR.axes3d(xtick, 0, ztick, xmin, ymin, zmin, 2, 0, 2, -ticksize)
GR.axes3d(0, ytick, 0, xmax, ymin, zmin, 0, 2, 0, ticksize) GR.axes3d(0, ytick, 0, xmax, ymin, zmin, 0, 2, 0, ticksize)
@ -1149,6 +1185,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
GR.savestate() GR.savestate()
GR.selntran(0) GR.selntran(0)
GR.setscale(0) GR.setscale(0)
gr_set_font(sp[:legendfont])
w = 0 w = 0
i = 0 i = 0
n = 0 n = 0
@ -1171,7 +1208,8 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
if w > 0 if w > 0
xpos = viewport_plotarea[2] - 0.05 - w xpos = viewport_plotarea[2] - 0.05 - w
ypos = viewport_plotarea[4] - 0.06 ypos = viewport_plotarea[4] - 0.06
dy = 0.03 * sqrt((viewport_plotarea[2] - viewport_plotarea[1])^2 + (viewport_plotarea[4] - viewport_plotarea[3])^2) # dy = 0.03 * sqrt((viewport_plotarea[2] - viewport_plotarea[1])^2 + (viewport_plotarea[4] - viewport_plotarea[3])^2)
dy = 0.03 * window_diag
GR.setfillintstyle(GR.INTSTYLE_SOLID) GR.setfillintstyle(GR.INTSTYLE_SOLID)
GR.setfillcolorind(gr_getcolorind(sp[:background_color_legend])) GR.setfillcolorind(gr_getcolorind(sp[:background_color_legend]))
GR.fillrect(xpos - 0.08, xpos + w + 0.02, ypos + dy, ypos - dy * n) GR.fillrect(xpos - 0.08, xpos + w + 0.02, ypos + dy, ypos - dy * n)
@ -1188,15 +1226,15 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
d = series.d d = series.d
st = d[:seriestype] st = d[:seriestype]
GR.setlinewidth(d[:linewidth]) GR.setlinewidth(d[:linewidth])
if d[:seriestype] in [:path, :sticks] if st == :path
GR.setlinecolorind(gr_getcolorind(d[:linecolor])) GR.setlinecolorind(gr_getcolorind(d[:linecolor]))
GR.setlinetype(gr_linetype[d[:linestyle]]) GR.setlinetype(gr_linetype[d[:linestyle]])
GR.polyline([xpos - 0.07, xpos - 0.01], [ypos, ypos]) GR.polyline([xpos - 0.07, xpos - 0.01], [ypos, ypos])
end end
if d[:seriestype] == :scatter || d[:markershape] != :none if st == :scatter || d[:markershape] != :none
GR.setmarkercolorind(gr_getcolorind(d[:markercolor])) GR.setmarkercolorind(gr_getcolorind(d[:markercolor]))
gr_setmarkershape(d) gr_setmarkershape(d)
if d[:seriestype] in [:path, :sticks] if st == :path
gr_polymarker(d, [xpos - 0.06, xpos - 0.02], [ypos, ypos]) gr_polymarker(d, [xpos - 0.06, xpos - 0.02], [ypos, ypos])
else else
gr_polymarker(d, [xpos - 0.06, xpos - 0.04, xpos - 0.02], [ypos, ypos, ypos]) gr_polymarker(d, [xpos - 0.06, xpos - 0.04, xpos - 0.02], [ypos, ypos, ypos])
@ -1222,15 +1260,16 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
for ann in sp[:annotations] for ann in sp[:annotations]
x, y, val = ann x, y, val = ann
x, y = GR.wctondc(x, y) x, y = GR.wctondc(x, y)
alpha = val.font.rotation # alpha = val.font.rotation
family = lowercase(val.font.family) # family = lowercase(val.font.family)
GR.setcharheight(0.7 * val.font.pointsize / sp.plt[:size][2]) # GR.setcharheight(0.7 * val.font.pointsize / sp.plt[:size][2])
GR.setcharup(sin(val.font.rotation), cos(val.font.rotation)) # GR.setcharup(sin(val.font.rotation), cos(val.font.rotation))
if haskey(gr_font_family, family) # if haskey(gr_font_family, family)
GR.settextfontprec(100 + gr_font_family[family], GR.TEXT_PRECISION_STRING) # GR.settextfontprec(100 + gr_font_family[family], GR.TEXT_PRECISION_STRING)
end # end
GR.settextcolorind(gr_getcolorind(val.font.color)) # GR.settextcolorind(gr_getcolorind(val.font.color))
GR.settextalign(gr_halign[val.font.halign], gr_valign[val.font.valign]) # GR.settextalign(gr_halign[val.font.halign], gr_valign[val.font.valign])
gr_set_font(val.font)
GR.text(x, y, val.str) GR.text(x, y, val.str)
end end
GR.restorestate() GR.restorestate()

45
src/recipes.jl
View File

@ -201,11 +201,15 @@ end
@recipe function f(::Type{Val{:steppre}}, x, y, z) @recipe function f(::Type{Val{:steppre}}, x, y, z)
d[:x], d[:y] = make_steps(x, y, :steppre) d[:x], d[:y] = make_steps(x, y, :steppre)
seriestype := :path seriestype := :path
# create a secondary series for the markers
if d[:markershape] != :none if d[:markershape] != :none
@series begin @series begin
seriestype := :scatter seriestype := :scatter
x := x x := x
y := y y := y
label := ""
primary := false
() ()
end end
markershape := :none markershape := :none
@ -217,11 +221,52 @@ end
@recipe function f(::Type{Val{:steppost}}, x, y, z) @recipe function f(::Type{Val{:steppost}}, x, y, z)
d[:x], d[:y] = make_steps(x, y, :steppost) d[:x], d[:y] = make_steps(x, y, :steppost)
seriestype := :path seriestype := :path
# create a secondary series for the markers
if d[:markershape] != :none if d[:markershape] != :none
@series begin @series begin
seriestype := :scatter seriestype := :scatter
x := x x := x
y := y y := y
label := ""
primary := false
()
end
markershape := :none
end
()
end
# ---------------------------------------------------------------------------
# sticks
sticks_fillfrom(fr::Void, i::Integer) = 0.0
sticks_fillfrom(fr::Number, i::Integer) = fr
sticks_fillfrom(fr::AVec, i::Integer) = fr[mod1(i, length(fr))]
# create vertical line segments from fill
@recipe function f(::Type{Val{:sticks}}, x, y, z)
n = length(x)
fr = d[:fillrange]
newx, newy = zeros(3n), zeros(3n)
for i=1:n
rng = 3i-2:3i
newx[rng] = [x[i], x[i], NaN]
newy[rng] = [sticks_fillfrom(fr,i), y[i], NaN]
end
d[:x], d[:y] = newx, newy
fillrange := nothing
seriestype := :path
# create a secondary series for the markers
if d[:markershape] != :none
@series begin
seriestype := :scatter
x := x
y := y
label := ""
primary := false
() ()
end end
markershape := :none markershape := :none

5
src/series_new.jl
View File

@ -12,7 +12,10 @@ function _add_defaults!(d::KW, plt::Plot, sp::Subplot, commandIndex::Int)
end end
# this is how many series belong to this subplot # this is how many series belong to this subplot
plotIndex = count(series -> series.d[:subplot] === sp, plt.series_list) + 1 plotIndex = count(series -> series.d[:subplot] === sp && series.d[:primary], plt.series_list)
if get(d, :primary, true)
plotIndex += 1
end
aliasesAndAutopick(d, :linestyle, _styleAliases, supportedStyles(pkg), plotIndex) aliasesAndAutopick(d, :linestyle, _styleAliases, supportedStyles(pkg), plotIndex)
aliasesAndAutopick(d, :markershape, _markerAliases, supportedMarkers(pkg), plotIndex) aliasesAndAutopick(d, :markershape, _markerAliases, supportedMarkers(pkg), plotIndex)