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

layouts fixed

Browse Source
This commit is contained in:
Thomas Breloff 2016-05-24 10:34:02 -04:00
parent bb6c06d3f7
commit 2c2218bcb9
2 changed files with 24 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/backends/pyplot.jl
View File

@ -88,7 +88,8 @@ function _initialize_backend(::PyPlotBackend)
end
end
# -------------------------------
# --------------------------------------------------------------------------------------
# --------------------------------------------------------------------------------------
# convert colorant to 4-tuple RGBA
getPyPlotColor(c::Colorant, α=nothing) = map(f->float(f(convertColor(c,α))), (red, green, blue, alpha))
@ -351,59 +352,6 @@ function py_bbox_title(ax)
bb
end
# ---------------------------------------------------------------------------
# # TODO: remove these after _min_padding is done
#
# # need to compute each of these by subtracting the plotarea position from
# # the most extreme guide/axis in each direction. Can pass method (left,top,right,bottom)
# # and aggregation (minimum or maximum) into a method to do this.
#
# min_padding_left(layout::Subplot{PyPlotBackend}) = compute_min_padding(layout, left, 1)
# min_padding_top(layout::Subplot{PyPlotBackend}) = compute_min_padding(layout, top, 1)
# min_padding_right(layout::Subplot{PyPlotBackend}) = compute_min_padding(layout, right, -1)
# min_padding_bottom(layout::Subplot{PyPlotBackend}) = compute_min_padding(layout, bottom,-1)
#
#
# # loop over the guides and axes and compute how far they "stick out" from the plot area,
# # so that we know the minimum padding we need to avoid cropping and overlapping text.
# # `func` is one of (left,top,right,bottom), and we multiply by 1 or -1 depending on direction
# function compute_min_padding(sp::Subplot{PyPlotBackend}, func::Function, mult::Number)
# ax = sp.o
# ax == nothing && return 0mm
# plotbb = py_bbox(ax)
# # @show func, mult plotbb
# # @show func, py_bbox_axis(ax, "x")
# # TODO: this should initialize to the margin from sp.attr
# padding = 1mm
# for bb in (py_bbox_axis(ax, "x"),
# py_bbox_axis(ax, "y"),
# py_bbox_title(ax))
# diff = func(plotbb) - func(bb)
# # @show diff,bb
# if ispositive(width(bb)) && ispositive(height(bb))
# padding = max(padding, mult * diff)
# end
# # @show padding
# end
#
# if func == right && haskey(sp.attr, :cbar_ax)
# # get width of colorbar labels and add to width of colorbar
# bb = py_bbox(sp.attr[:cbar_handle][:ax][:get_yticklabels]())
# sp.attr[:cbar_width] = _cbar_width + width(bb) + 1mm
# padding = padding + sp.attr[:cbar_width]
# end
#
# # if func == top
# # titlebbox = py_bbox_title(ax)
# # padding = max(padding, height(titlebbox))
# # @show titlebbox height(titlebbox),padding
# # end
#
# padding
# end
# ---------------------------------------------------------------------------
function pyplot_figure(plotargs::KW)

45
src/layouts.jl
View File

@ -253,22 +253,22 @@ function update_child_bboxes!(layout::GridLayout)
pad_top = maximum(minpad_top, 2)
pad_right = maximum(minpad_right, 1)
pad_bottom = maximum(minpad_bottom, 2)
@show pad_left pad_top pad_right pad_bottom
# @show pad_left pad_top pad_right pad_bottom
# scale this up to the total padding in each direction
total_pad_horizontal = (pad_left + pad_right) .* nc
total_pad_vertical = (pad_top + pad_bottom) .* nr
@show total_pad_horizontal total_pad_vertical
total_pad_horizontal = sum(pad_left + pad_right)
total_pad_vertical = sum(pad_top + pad_bottom)
# @show total_pad_horizontal total_pad_vertical
# now we can compute the total plot area in each direction
total_plotarea_horizontal = width(layout) - sum(total_pad_horizontal)
total_plotarea_vertical = height(layout) - sum(total_pad_vertical)
@show total_plotarea_horizontal total_plotarea_vertical
total_plotarea_horizontal = width(layout) - total_pad_horizontal
total_plotarea_vertical = height(layout) - total_pad_vertical
# @show total_plotarea_horizontal total_plotarea_vertical
# normalize widths/heights so they sum to 1
denom_w = sum(layout.widths)
denom_h = sum(layout.heights)
@show layout.widths layout.heights denom_w, denom_h
# @show layout.widths layout.heights denom_w, denom_h
# we have all the data we need... lets compute the plot areas and set the bounding boxes
for r=1:nr, c=1:nc
@ -283,29 +283,28 @@ function update_child_bboxes!(layout::GridLayout)
plotarea_top = child_top + pad_top[r]
plotarea_width = total_plotarea_horizontal * layout.widths[c] / denom_w
plotarea_height = total_plotarea_vertical * layout.heights[r] / denom_h
child_plotarea = BoundingBox(plotarea_left, plotarea_top, plotarea_width, plotarea_height)
plotarea!(child, BoundingBox(plotarea_left, plotarea_top, plotarea_width, plotarea_height))
# compute child bbox
child_width = pad_left[c] + plotarea_width + pad_right[c]
child_height = pad_top[r] + plotarea_height + pad_bottom[r]
child_bbox = BoundingBox(child_left, child_top, child_width, child_height)
@show (r,c) child_plotarea child_bbox
plotarea!(child, child_plotarea)
bbox!(child, child_bbox)
end
# now re-scale/crop to the figure dimensions, and recursively update the children
for child in layout.grid
# the bounding boxes are currently relative to the parent, but we need them relative to the canvas
# plotarea!(child, crop(layout.bbox, plotarea(child)))
# bbox!(child, crop(layout.bbox, bbox(child)))
# @show "!!!" plotarea(child) bbox(child)
bbox!(child, BoundingBox(child_left, child_top, child_width, child_height))
# recursively update the child's children
update_child_bboxes!(child)
@show "???" plotarea(child) bbox(child)
end
# # now re-scale/crop to the figure dimensions, and recursively update the children
# for child in layout.grid
# # the bounding boxes are currently relative to the parent, but we need them relative to the canvas
# # plotarea!(child, crop(layout.bbox, plotarea(child)))
# # bbox!(child, crop(layout.bbox, bbox(child)))
# # @show "!!!" plotarea(child) bbox(child)
#
# # recursively update the child's children
# update_child_bboxes!(child)
# @show "???" plotarea(child) bbox(child)
# end
end