diff --git a/src/backends/pgfplotsx.jl b/src/backends/pgfplotsx.jl index e02d3d9f..88845887 100644 --- a/src/backends/pgfplotsx.jl +++ b/src/backends/pgfplotsx.jl @@ -93,6 +93,23 @@ function (pgfx_plot::PGFPlotsXPlot)(plt::Plot{PGFPlotsXBackend}) ) end + # the combination of groupplot and polaraxis is broken in pgfplots + if !any( sp -> ispolar(sp), plt.subplots ) + pl_height, pl_width = plt.attr[:size] + push!( the_plot, PGFPlotsX.GroupPlot( + PGFPlotsX.Options( + "group style" => PGFPlotsX.Options( + "group size" => string(cols)*" by "*string(rows), + "horizontal sep" => string(maximum(sp -> sp.minpad[1], plt.subplots)), + "vertical sep" => string(maximum(sp -> sp.minpad[2], plt.subplots)), + ), + "height" => pl_height > 0 ? string(pl_height * px) : "{}", + "width" => pl_width > 0 ? string(pl_width * px) : "{}", + ) + )) + end + inset_subplots = plt.inset_subplots + parents = getproperty.(inset_subplots, :parent) for sp in plt.subplots bb = bbox(sp) sp_width = width(bb) @@ -220,148 +237,145 @@ function (pgfx_plot::PGFPlotsXPlot)(plt::Plot{PGFPlotsXBackend}) PGFPlotsX.Axis end axis = axisf(axis_opt) - for (series_index, series) in enumerate(series_list(sp)) - opt = series.plotattributes - st = series[:seriestype] - series_opt = PGFPlotsX.Options("color" => single_color(opt[:linecolor]),) - if is3d(series) || st == :heatmap - series_func = PGFPlotsX.Plot3 - else - series_func = PGFPlotsX.Plot - end - if series[:fillrange] !== nothing && - !isfilledcontour(series) && series[:ribbon] === nothing - push!(series_opt, "area legend" => nothing) - end - if st == :heatmap - push!(axis.options, "view" => "{0}{90}") - end + push!(axis_opt, "colorbar style" => PGFPlotsX.Options( + "title" => sp[:colorbar_title], + "point meta max" => get_clims(sp)[2], + "point meta min" => get_clims(sp)[1] + ) + ) + if is3d(sp) + azim, elev = sp[:camera] + push!( axis_opt, "view" => (azim, elev) ) + end + axisf = if sp[:projection] == :polar + # push!(axis_opt, "xmin" => 90) + # push!(axis_opt, "xmax" => 450) + PGFPlotsX.PolarAxis + else + PGFPlotsX.Axis + end + axis = axisf( + axis_opt + ) + for (series_index, series) in enumerate(series_list(sp)) + opt = series.plotattributes + st = series[:seriestype] + series_opt = PGFPlotsX.Options( + "color" => single_color(opt[:linecolor]), + ) + if is3d(series) || st == :heatmap + series_func = PGFPlotsX.Plot3 + else + series_func = PGFPlotsX.Plot + end + if series[:fillrange] !== nothing && !isfilledcontour(series) && series[:ribbon] === nothing + push!(series_opt, "area legend" => nothing) + end + if st == :heatmap + push!(axis.options, + "view" => "{0}{90}", + ) + end # treat segments - segments = - if st in (:wireframe, :heatmap, :contour, :surface, :contour3d) - iter_segments(surface_to_vecs( - series[:x], - series[:y], - series[:z], - )...) - else - iter_segments(series) - end - for (i, rng) in enumerate(segments) - segment_opt = PGFPlotsX.Options() - segment_opt = merge(segment_opt, pgfx_linestyle(opt, i)) - if opt[:markershape] != :none - marker = opt[:markershape] - if marker isa Shape - x = marker.x - y = marker.y - scale_factor = 0.025 - mark_size = opt[:markersize] * scale_factor - path = join( - ["($(x[i] * mark_size), $(y[i] * mark_size))" for i in eachindex(x)], - " -- ", - ) - c = get_markercolor(series, i) - a = get_markeralpha(series, i) - PGFPlotsX.push_preamble!( - pgfx_plot.the_plot, - """ - \\pgfdeclareplotmark{PlotsShape$(series_index)}{ - \\filldraw - $path; - } - """, - ) - end - segment_opt = merge(segment_opt, pgfx_marker(opt, i)) - end - if st == :shape || isfilledcontour(series) - segment_opt = merge(segment_opt, pgfx_fillstyle(opt, i)) - end + segments = if st in (:wireframe, :heatmap, :contour, :surface, :contour3d) + iter_segments(surface_to_vecs(series[:x], series[:y], series[:z])...) + else + iter_segments(series) + end + for (i, rng) in enumerate(segments) + segment_opt = PGFPlotsX.Options() + segment_opt = merge( segment_opt, pgfx_linestyle(opt, i) ) + if opt[:markershape] != :none + marker = opt[:markershape] + if marker isa Shape + x = marker.x + y = marker.y + scale_factor = 0.025 + mark_size = opt[:markersize] * scale_factor + path = join(["($(x[i] * mark_size), $(y[i] * mark_size))" for i in eachindex(x)], " -- ") + c = get_markercolor(series, i) + a = get_markeralpha(series, i) + PGFPlotsX.push_preamble!(pgfx_plot.the_plot, + """ + \\pgfdeclareplotmark{PlotsShape$(series_index)}{ + \\filldraw + $path; + } + """ + ) + end + segment_opt = merge( segment_opt, pgfx_marker(opt, i) ) + end + if st == :shape || + isfilledcontour(series) + segment_opt = merge( segment_opt, pgfx_fillstyle(opt, i) ) + end # add fillrange - if series[:fillrange] !== nothing && - !isfilledcontour(series) && series[:ribbon] === nothing - pgfx_fillrange_series!( - axis, - series, - series_func, - i, - _cycle(series[:fillrange], rng), - rng, - ) - if i == 1 && - opt[:label] != "" && - sp[:legend] != :none && should_add_to_legend(series) - pgfx_filllegend!(series_opt, opt) - end - end + if series[:fillrange] !== nothing && !isfilledcontour(series) && series[:ribbon] === nothing + pgfx_fillrange_series!( axis, series, series_func, i, _cycle(series[:fillrange], rng), rng) + if i == 1 && opt[:label] != "" && sp[:legend] != :none && should_add_to_legend(series) + pgfx_filllegend!(series_opt, opt) + end + end # series # - coordinates = pgfx_series_coordinates!( - sp, - series, - segment_opt, - opt, - rng, - ) - segment_plot = series_func( - merge(series_opt, segment_opt), - coordinates, - ) - push!(axis, segment_plot) + coordinates = pgfx_series_coordinates!( sp, series, segment_opt, opt, rng ) + segment_plot = series_func( + merge(series_opt, segment_opt), + coordinates, + ) + push!(axis, segment_plot) # add ribbons? - ribbon = series[:ribbon] - if ribbon !== nothing - pgfx_add_ribbons!( - axis, - series, - segment_plot, - series_func, - series_index, - ) - end + ribbon = series[:ribbon] + if ribbon !== nothing + pgfx_add_ribbons!( axis, series, segment_plot, series_func, series_index ) + end # add to legend? - if i == 1 && - opt[:label] != "" && - sp[:legend] != :none && should_add_to_legend(series) - leg_opt = PGFPlotsX.Options() - if ribbon !== nothing - pgfx_filllegend!(axis.contents[end-3].options, opt) - end - legend = PGFPlotsX.LegendEntry(leg_opt, opt[:label], false) - push!(axis, legend) - end + if i == 1 && opt[:label] != "" && sp[:legend] != :none && should_add_to_legend(series) + leg_opt = PGFPlotsX.Options() + if ribbon !== nothing + pgfx_filllegend!(axis.contents[end-3].options, opt) + end + legend = PGFPlotsX.LegendEntry(leg_opt, opt[:label], false) + push!( axis, legend ) + end # add series annotations - anns = series[:series_annotations] - for (xi, yi, str, fnt) in EachAnn(anns, series[:x], series[:y]) - pgfx_add_annotation!( - axis, - xi, - yi, - PlotText(str, fnt), - pgfx_thickness_scaling(series), - ) - end - end + anns = series[:series_annotations] + for (xi,yi,str,fnt) in EachAnn(anns, series[:x], series[:y]) + pgfx_add_annotation!(axis, xi, yi, PlotText(str, fnt), pgfx_thickness_scaling(series)) + end + end # add subplot annotations - anns = sp.attr[:annotations] - for (xi, yi, txt) in anns - pgfx_add_annotation!( - axis, - xi, - yi, - txt, - pgfx_thickness_scaling(sp), - ) - end - end - push!(the_plot, axis) - if length(plt.o.the_plot.elements) > 0 - plt.o.the_plot.elements[1] = the_plot - else - push!(plt.o, the_plot) - end - end + anns = sp.attr[:annotations] + for (xi,yi,txt) in anns + pgfx_add_annotation!(axis, xi, yi, txt, pgfx_thickness_scaling(sp)) + end + end + if ispolar(sp) + axes = the_plot + else + axes = the_plot.elements[1] + end + ##< handle insets + # TODO: build id map for subplots like for series + if sp in parents + sp_id = uuid4() + push!(axis, "\\coordinate ($sp_id) at (rel axis cs:$())") # TODO: compute rel coordinates from bboxes + end + if sp in inset_subplots + push!(axis.options, PGFPlotsX.Options( + "at" => "($())", # TODO: insert correct ID here + "anchor" => "outer south west", # TODO: check this + )) + end + ##> + push!( axes, axis ) + if length(plt.o.the_plot.elements) > 0 + plt.o.the_plot.elements[1] = the_plot + else + push!(plt.o, the_plot) + end + end pgfx_plot.is_created = true end # if return pgfx_plot