diff --git a/src/animation.jl b/src/animation.jl index 13075a78..a11e48db 100644 --- a/src/animation.jl +++ b/src/animation.jl @@ -31,7 +31,7 @@ function gif(anim::Animation, fn::@compat(AbstractString) = "tmp.gif"; fps::Inte # high quality speed = round(Int, 100 / fps) - run(`convert -delay $speed -loop 0 $(anim.dir)/*.png $fn`) + run(`convert -delay $speed -loop 0 $(anim.dir)/*.png -alpha off $fn`) catch err warn("Tried to create gif using convert (ImageMagick), but got error: $err\nWill try ffmpeg, but it's lower quality...)") diff --git a/src/backends/gr.jl b/src/backends/gr.jl index 8dcb5f65..8790db68 100644 --- a/src/backends/gr.jl +++ b/src/backends/gr.jl @@ -1,7 +1,6 @@ # https://github.com/jheinen/GR.jl - function _initialize_backend(::GRPackage; kw...) @eval begin import GR @@ -9,15 +8,16 @@ function _initialize_backend(::GRPackage; kw...) end end - const gr_linetype = Dict( :auto => 1, :solid => 1, :dash => 2, :dot => 3, :dashdot => 4, :dashdotdot => -1 ) const gr_markertype = Dict( :auto => 1, :none => -1, :ellipse => -1, :rect => -7, :diamond => -13, - :utriangle => -3, :dtriangle => -5, :pentagon => -14, :hexagon => 3, - :cross => 2, :xcross => 5, :star5 => 3 ) + :utriangle => -3, :dtriangle => -5, :pentagon => -21, :hexagon => -22, + :heptagon => -23, :octagon => -24, :cross => 2, :xcross => 5, + :star4 => -25, :star5 => -26, :star6 => -27, :star7 => -28, :star8 => -29, + :vline => -30, :hline => -31 ) const gr_halign = Dict(:left => 1, :hcenter => 2, :right => 3) const gr_valign = Dict(:top => 1, :vcenter => 3, :bottom => 5) @@ -54,19 +54,41 @@ function gr_display(plt::Plot{GRPackage}, clear=true, update=true, msize = mwidth * w / width GR.setwsviewport(0, msize, 0, msize * ratio) GR.setwswindow(0, 1, 0, ratio) - viewport[1] = subplot[1] + 0.1 * (subplot[2] - subplot[1]) - viewport[2] = subplot[1] + 0.95 * (subplot[2] - subplot[1]) - viewport[3] = ratio * (subplot[3] + 0.1 * (subplot[4] - subplot[3])) - viewport[4] = ratio * (subplot[3] + 0.95 * (subplot[4] - subplot[3])) + viewport[1] = subplot[1] + 0.125 * (subplot[2] - subplot[1]) + viewport[2] = subplot[1] + 0.95 * (subplot[2] - subplot[1]) + viewport[3] = ratio * (subplot[3] + 0.125 * (subplot[4] - subplot[3])) + viewport[4] = ratio * (subplot[3] + 0.95 * (subplot[4] - subplot[3])) else ratio = float(w) / h msize = mheight * h / height GR.setwsviewport(0, msize * ratio, 0, msize) GR.setwswindow(0, ratio, 0, 1) - viewport[1] = ratio * (subplot[1] + 0.1 * (subplot[2] - subplot[1])) - viewport[2] = ratio * (subplot[1] + 0.95 * (subplot[2] - subplot[1])) - viewport[3] = subplot[3] + 0.1 * (subplot[4] - subplot[3]) - viewport[4] = subplot[3] + 0.95 * (subplot[4] - subplot[3]) + viewport[1] = ratio * (subplot[1] + 0.125 * (subplot[2] - subplot[1])) + viewport[2] = ratio * (subplot[1] + 0.95 * (subplot[2] - subplot[1])) + viewport[3] = subplot[3] + 0.125 * (subplot[4] - subplot[3]) + viewport[4] = subplot[3] + 0.95 * (subplot[4] - subplot[3]) + end + + if haskey(d, :background_color) + GR.savestate() + GR.selntran(0) + GR.setfillintstyle(GR.INTSTYLE_SOLID) + GR.setfillcolorind(gr_getcolorind(d[:background_color])) + if w > h + GR.fillrect(subplot[1], subplot[2], ratio*subplot[3], ratio*subplot[4]) + else + GR.fillrect(ratio*subplot[1], ratio*subplot[2], subplot[3], subplot[4]) + end + GR.selntran(1) + GR.restorestate() + c = getColor(d[:background_color]) + if 0.21 * c.r + 0.72 * c.g + 0.07 * c.b < 0.9 + fg = convert(Int, GR.inqcolorfromrgb(1-c.r, 1-c.g, 1-c.b)) + else + fg = 1 + end + else + fg = 1 end extrema = zeros(2, 4) @@ -99,6 +121,10 @@ function gr_display(plt::Plot{GRPackage}, clear=true, update=true, end cmap = true x, y, H = Base.hist2d(E, xbins, ybins) + elseif p[:linetype] == :pie + axes_2d = false + xmin, xmax, ymin, ymax = 0, 1, 0, 1 + x, y = p[:x], p[:y] else if p[:linetype] in [:contour, :surface] cmap = true @@ -108,31 +134,44 @@ function gr_display(plt::Plot{GRPackage}, clear=true, update=true, end x, y = p[:x], p[:y] end - xmin = min(minimum(x), xmin) - xmax = max(maximum(x), xmax) - if p[:linetype] == :ohlc - for val in y - ymin = min(val.open, val.high, val.low, val.close, ymin) - ymax = max(val.open, val.high, val.low, val.close, ymax) + if p[:linetype] != :pie + xmin = min(minimum(x), xmin) + xmax = max(maximum(x), xmax) + if p[:linetype] == :ohlc + for val in y + ymin = min(val.open, val.high, val.low, val.close, ymin) + ymax = max(val.open, val.high, val.low, val.close, ymax) + end + else + ymin = min(minimum(y), ymin) + ymax = max(maximum(y), ymax) end - else - ymin = min(minimum(y), ymin) - ymax = max(maximum(y), ymax) end end end + if xmax <= xmin + xmax = xmin + 1 + end + if ymax <= ymin + ymax = ymin + 1 + end extrema[axis,:] = [xmin, xmax, ymin, ymax] end if num_axes == 2 || !axes_2d - viewport[2] -= 0.05 + viewport[2] -= 0.0525 end if cmap viewport[2] -= 0.1 end GR.setviewport(viewport[1], viewport[2], viewport[3], viewport[4]) - scale = d[:scale] + scale = 0 + d[:xscale] == :log10 && (scale |= GR.OPTION_X_LOG) + d[:yscale] == :log10 && (scale |= GR.OPTION_Y_LOG) + get(d, :xflip, false) && (scale |= GR.OPTION_FLIP_X) + get(d, :yflip, false) && (scale |= GR.OPTION_FLIP_Y) + for axis = 1:num_axes xmin, xmax, ymin, ymax = extrema[axis,:] if scale & GR.OPTION_X_LOG == 0 @@ -161,22 +200,20 @@ function gr_display(plt::Plot{GRPackage}, clear=true, update=true, end GR.setwindow(xmin, xmax, ymin, ymax) - if axis == 1 && haskey(d, :background_color) - GR.savestate() - GR.setfillintstyle(GR.INTSTYLE_SOLID) - GR.setfillcolorind(gr_getcolorind(d[:background_color])) - GR.fillrect(xmin, xmax, ymin, ymax) - GR.restorestate() - end GR.setscale(scale) + diag = sqrt((viewport[2] - viewport[1])^2 + (viewport[4] - viewport[3])^2) + charheight = max(0.018 * diag, 0.01) + GR.setcharheight(charheight) + GR.settextcolorind(fg) + if axes_2d - diag = sqrt((viewport[2] - viewport[1])^2 + (viewport[4] - viewport[3])^2) GR.setlinewidth(1) - charheight = max(0.018 * diag, 0.01) - GR.setcharheight(charheight) + GR.setlinecolorind(fg) ticksize = 0.0075 * diag - GR.grid(xtick, ytick, 0, 0, majorx, majory) + if fg == 1 + GR.grid(xtick, ytick, 0, 0, majorx, majory) + end if num_axes == 1 GR.axes(xtick, ytick, xorg[1], yorg[1], majorx, majory, ticksize) GR.axes(xtick, ytick, xorg[2], yorg[2], -majorx, -majory, -ticksize) @@ -191,19 +228,22 @@ function gr_display(plt::Plot{GRPackage}, clear=true, update=true, if get(d, :title, "") != "" GR.savestate() GR.settextalign(GR.TEXT_HALIGN_CENTER, GR.TEXT_VALIGN_TOP) - GR.text(0.5, min(ratio, 1), d[:title]) + GR.settextcolorind(fg) + GR.text(0.5 * (viewport[1] + viewport[2]), min(ratio, 1), d[:title]) GR.restorestate() end if get(d, :xlabel, "") != "" GR.savestate() GR.settextalign(GR.TEXT_HALIGN_CENTER, GR.TEXT_VALIGN_BOTTOM) - GR.text(0.5, 0, d[:xlabel]) + GR.settextcolorind(fg) + GR.text(0.5 * (viewport[1] + viewport[2]), 0, d[:xlabel]) GR.restorestate() end if get(d, :ylabel, "") != "" GR.savestate() GR.settextalign(GR.TEXT_HALIGN_CENTER, GR.TEXT_VALIGN_TOP) GR.setcharup(-1, 0) + GR.settextcolorind(fg) GR.text(0, 0.5 * (viewport[3] + viewport[4]), d[:ylabel]) GR.restorestate() end @@ -211,6 +251,7 @@ function gr_display(plt::Plot{GRPackage}, clear=true, update=true, GR.savestate() GR.settextalign(GR.TEXT_HALIGN_CENTER, GR.TEXT_VALIGN_TOP) GR.setcharup(1, 0) + GR.settextcolorind(fg) GR.text(1, 0.5 * (viewport[3] + viewport[4]), d[:yrightlabel]) GR.restorestate() end @@ -231,14 +272,18 @@ function gr_display(plt::Plot{GRPackage}, clear=true, update=true, GR.setfillcolorind(gr_getcolorind(p[:fillcolor])) GR.setfillintstyle(GR.INTSTYLE_SOLID) end - if p[:fillrange] != nothing - GR.fillarea([p[:x][1]; p[:x]; p[:x][length(p[:x])]], [p[:fillrange]; p[:y]; p[:fillrange]]) + if length(p[:x]) > 1 + if p[:fillrange] != nothing + GR.fillarea([p[:x][1]; p[:x]; p[:x][length(p[:x])]], [p[:fillrange]; p[:y]; p[:fillrange]]) + end + GR.polyline(p[:x], p[:y]) end - GR.polyline(p[:x], p[:y]) legend = true end if p[:linetype] == :line - GR.polyline(p[:x], p[:y]) + if length(p[:x]) > 1 + GR.polyline(p[:x], p[:y]) + end legend = true elseif p[:linetype] in [:steppre, :steppost] n = length(p[:x]) @@ -256,7 +301,9 @@ function gr_display(plt::Plot{GRPackage}, clear=true, update=true, end j += 2 end - GR.polyline(x, y) + if n > 1 + GR.polyline(x, y) + end legend = true elseif p[:linetype] == :sticks x, y = p[:x], p[:y] @@ -270,7 +317,9 @@ function gr_display(plt::Plot{GRPackage}, clear=true, update=true, if haskey(d, :markersize) if typeof(d[:markersize]) <: Number GR.setmarkersize(d[:markersize] / 4.0) - GR.polymarker(p[:x], p[:y]) + if length(p[:x]) > 0 + GR.polymarker(p[:x], p[:y]) + end else c = p[:markercolor] GR.setcolormap(-GR.COLORMAP_GLOWING) @@ -284,7 +333,9 @@ function gr_display(plt::Plot{GRPackage}, clear=true, update=true, end end else - GR.polymarker(p[:x], p[:y]) + if length(p[:x]) > 0 + GR.polymarker(p[:x], p[:y]) + end end legend = true elseif p[:linetype] == :bar @@ -368,11 +419,9 @@ function gr_display(plt::Plot{GRPackage}, clear=true, update=true, diag = sqrt((viewport[2] - viewport[1])^2 + (viewport[4] - viewport[3])^2) charheight = max(0.018 * diag, 0.01) ticksize = 0.01 * (viewport[2] - viewport[1]) - # GR.savestate() GR.setlinewidth(1) GR.grid3d(xtick, 0, ztick, xmin, ymin, zmin, 2, 0, 2) GR.grid3d(0, ytick, 0, xmax, ymin, zmin, 0, 2, 0) - # GR.restorestate() z = reshape(z, length(x) * length(y)) if p[:linetype] == :surface GR.setcolormap(GR.COLORMAP_COOLWARM) @@ -400,11 +449,11 @@ function gr_display(plt::Plot{GRPackage}, clear=true, update=true, diag = sqrt((viewport[2] - viewport[1])^2 + (viewport[4] - viewport[3])^2) charheight = max(0.018 * diag, 0.01) ticksize = 0.01 * (viewport[2] - viewport[1]) - # GR.savestate() GR.setlinewidth(1) - GR.grid3d(xtick, 0, ztick, xmin, ymin, zmin, 2, 0, 2) - GR.grid3d(0, ytick, 0, xmax, ymin, zmin, 0, 2, 0) - # GR.restorestate() + if p[:linetype] == :path3d + GR.grid3d(xtick, 0, ztick, xmin, ymin, zmin, 2, 0, 2) + GR.grid3d(0, ytick, 0, xmax, ymin, zmin, 0, 2, 0) + end if p[:linetype] == :scatter3d haskey(p, :markercolor) && GR.setmarkercolorind(gr_getcolorind(p[:markercolor])) haskey(p, :markershape) && GR.setmarkertype(gr_markertype[p[:markershape]]) @@ -414,7 +463,9 @@ function gr_display(plt::Plot{GRPackage}, clear=true, update=true, end else haskey(p, :linewidth) && GR.setlinewidth(p[:linewidth]) - GR.polyline3d(x, y, z) + if length(x) > 0 + GR.polyline3d(x, y, z) + end end GR.setlinewidth(1) GR.setcharheight(charheight) @@ -429,8 +480,33 @@ function gr_display(plt::Plot{GRPackage}, clear=true, update=true, GR.polyline([i, i], [y[i].low, y[i].high]) GR.polyline([i, i+ticksize], [y[i].close, y[i].close]) end - elseif p[:linetype] in [:pie] - println("TODO: add support for linetype $(p[:linetype])") + elseif p[:linetype] == :pie + GR.selntran(0) + GR.settextalign(GR.TEXT_HALIGN_CENTER, GR.TEXT_VALIGN_HALF) + GR.setfillintstyle(GR.INTSTYLE_SOLID) + xmin, xmax, ymin, ymax = viewport + ymax -= 0.05 * (xmax - xmin) + xcenter = 0.5 * (xmin + xmax) + ycenter = 0.5 * (ymin + ymax) + if xmax - xmin > ymax - ymin + r = 0.5 * (ymax - ymin) + xmin, xmax = xcenter - r, xcenter + r + else + r = 0.5 * (xmax - xmin) + ymin, ymax = ycenter - r, ycenter + r + end + x, y = p[:x], p[:y] + total = sum(y) + a1 = 0 + for i in 1:length(y) + a2 = round(Int, a1 + (y[i] / total) * 360.0) + GR.setfillcolorind(980 + (i-1) % 20) + GR.fillarc(xmin, xmax, ymin, ymax, a1, a2) + GR.text(xcenter + 0.5 * r * cos(0.5 * (a1 + a2) * pi / 180), + ycenter + 0.5 * r * sin(0.5 * (a1 + a2) * pi / 180), string(x[i])) + a1 = a2 + end + GR.selntran(1) end GR.restorestate() end @@ -453,13 +529,13 @@ function gr_display(plt::Plot{GRPackage}, clear=true, update=true, end px = viewport[2] - 0.05 - w py = viewport[4] - 0.06 + dy = 0.03 * sqrt((viewport[2] - viewport[1])^2 + (viewport[4] - viewport[3])^2) GR.setfillintstyle(GR.INTSTYLE_SOLID) GR.setfillcolorind(0) - GR.fillrect(px - 0.08, px + w + 0.02, py + 0.03, py - 0.03 * length(plt.seriesargs)) + GR.fillrect(px - 0.08, px + w + 0.02, py + dy, py - dy * length(plt.seriesargs)) GR.setlinetype(1) - GR.setlinecolorind(1) GR.setlinewidth(1) - GR.drawrect(px - 0.08, px + w + 0.02, py + 0.03, py - 0.03 * length(plt.seriesargs)) + GR.drawrect(px - 0.08, px + w + 0.02, py + dy, py - dy * length(plt.seriesargs)) haskey(d, :linewidth) && GR.setlinewidth(d[:linewidth]) i = 0 for p in plt.seriesargs @@ -484,8 +560,9 @@ function gr_display(plt::Plot{GRPackage}, clear=true, update=true, lab = p[:label] end GR.settextalign(GR.TEXT_HALIGN_LEFT, GR.TEXT_VALIGN_HALF) + GR.settextcolorind(1) GR.text(px, py, lab) - py -= 0.03 + py -= dy end GR.selntran(1) GR.restorestate() @@ -530,7 +607,6 @@ function gr_display(subplt::Subplot{GRPackage}) end function _create_plot(pkg::GRPackage; kw...) - isijulia() && GR.inline("svg") d = Dict(kw) Plot(nothing, pkg, 0, d, Dict[]) end @@ -555,13 +631,6 @@ function _before_update_plot(plt::Plot{GRPackage}) end function _update_plot(plt::Plot{GRPackage}, d::Dict) - scale = 0 - d[:xscale] == :log10 && (scale |= GR.OPTION_X_LOG) - d[:yscale] == :log10 && (scale |= GR.OPTION_Y_LOG) - get(d, :xflip, false) && (scale |= GR.OPTION_FLIP_X) - get(d, :yflip, false) && (scale |= GR.OPTION_FLIP_Y) - plt.plotargs[:scale] = scale - for k in (:title, :xlabel, :ylabel) haskey(d, k) && (plt.plotargs[k] = d[k]) end @@ -600,6 +669,7 @@ end # ---------------------------------------------------------------- function Base.writemime(io::IO, m::MIME"image/png", plt::PlottingObject{GRPackage}) + GR.emergencyclosegks() ENV["GKS_WSTYPE"] = "png" gr_display(plt) GR.emergencyclosegks() @@ -607,13 +677,29 @@ function Base.writemime(io::IO, m::MIME"image/png", plt::PlottingObject{GRPackag end function Base.writemime(io::IO, m::MIME"image/svg+xml", plt::PlottingObject{GRPackage}) - isijulia() || return + GR.emergencyclosegks() ENV["GKS_WSTYPE"] = "svg" gr_display(plt) GR.emergencyclosegks() write(io, readall("gks.svg")) end +function Base.writemime(io::IO, m::MIME"application/pdf", plt::PlottingObject{GRPackage}) + GR.emergencyclosegks() + ENV["GKS_WSTYPE"] = "pdf" + gr_display(plt) + GR.emergencyclosegks() + write(io, readall("gks.pdf")) +end + +function Base.writemime(io::IO, m::MIME"application/postscript", plt::PlottingObject{GRPackage}) + GR.emergencyclosegks() + ENV["GKS_WSTYPE"] = "ps" + gr_display(plt) + GR.emergencyclosegks() + write(io, readall("gks.ps")) +end + function Base.display(::PlotsDisplay, plt::Plot{GRPackage}) gr_display(plt) end diff --git a/src/backends/supported.jl b/src/backends/supported.jl index ee7d77b9..e1dadbed 100644 --- a/src/backends/supported.jl +++ b/src/backends/supported.jl @@ -189,6 +189,7 @@ supportedArgs(::GRPackage) = [ :label, :layout, :legend, + :colorbar, :linestyle, :linetype, :linewidth, @@ -239,8 +240,8 @@ supportedTypes(::GRPackage) = [:none, :line, :path, :steppre, :steppost, :sticks :scatter, :heatmap, :hexbin, :hist, :density, :bar, :hline, :vline, :contour, :path3d, :scatter3d, :surface, :wireframe, :ohlc, :pie] -supportedStyles(::GRPackage) = [:auto, :solid, :dash, :dot, :dashdot] -supportedMarkers(::GRPackage) = vcat([:none, :ellipse, :rect, :diamond, :utriangle, :dtriangle, :pentagon, :hexagon, :cross, :xcross, :star5], Shape) +supportedStyles(::GRPackage) = [:auto, :solid, :dash, :dot, :dashdot, :dashdotdot] +supportedMarkers(::GRPackage) = vcat(_allMarkers, Shape) supportedScales(::GRPackage) = [:identity, :log10] subplotSupported(::GRPackage) = true