From ca866183f1f6bbc75c041afc5b6ba5c1703d040f Mon Sep 17 00:00:00 2001 From: Josef Heinen Date: Tue, 5 Jan 2016 17:01:54 +0100 Subject: [PATCH 01/14] Print TODO messages for missing features --- src/backends/gr.jl | 50 +++++++++++++++++++++++++++------------ src/backends/supported.jl | 7 +++--- 2 files changed, 39 insertions(+), 18 deletions(-) diff --git a/src/backends/gr.jl b/src/backends/gr.jl index 0b87100c..50d296b1 100644 --- a/src/backends/gr.jl +++ b/src/backends/gr.jl @@ -2,12 +2,12 @@ # https://github.com/jheinen/GR.jl const gr_linetype = Dict( - :auto => 0, :solid => 1, :dash => 2, :dot => 3, :dashdot => 4, + :auto => 1, :solid => 1, :dash => 2, :dot => 3, :dashdot => 4, :dashdotdot => -1 ) const gr_markertype = Dict( - :none => 1, :ellipse => -1, :rect => -7, :diamond => -13, - :utriangle => -3, :dtriangle => -5, :pentagon => -14, + :auto => 1, :ellipse => -1, :rect => -7, :diamond => -13, + :utriangle => -3, :dtriangle => -5, :pentagon => -14, :hexagon => 3, :cross => 2, :xcross => 5, :star5 => 3 ) function gr_display(plt::Plot{GRPackage}) @@ -37,8 +37,13 @@ function gr_display(plt::Plot{GRPackage}) x, y = p[:x], p[:y] xmin = min(minimum(x), xmin) xmax = max(maximum(x), xmax) - ymin = min(minimum(y), ymin) - ymax = max(maximum(y), ymax) + # catch exception for OHLC vectors + try + ymin = min(minimum(y), ymin) + ymax = max(maximum(y), ymax) + catch MethodError + ymin, ymax = 0, 1 + end end scale = d[:scale] @@ -101,16 +106,27 @@ function gr_display(plt::Plot{GRPackage}) GR.savestate() haskey(d, :linewidth) && GR.setlinewidth(d[:linewidth]) haskey(d, :linestyle) && GR.setlinetype(gr_linetype[d[:linestyle]]) - haskey(d, :markersize) && GR.setmarkersize(d[:markersize]) - haskey(d, :markershape) && GR.setmarkertype(gr_markertype[d[:markershape]]) + if haskey(d, :markersize) + typeof(d[:markersize]) <: Number && GR.setmarkersize(d[:markersize] / 4.0) + else + println("TODO: multiple marker sizes") + end + if haskey(d, :markershape) + typeof(d[:markershape]) == Symbol && GR.setmarkertype(gr_markertype[d[:markershape]]) + else + println("TODO: user-defined marker shapes") + end GR.settextalign(GR.TEXT_HALIGN_LEFT, GR.TEXT_VALIGN_HALF) + GR.uselinespec(" ") for p in plt.seriesargs GR.uselinespec("") if p[:linetype] == :path GR.polyline(p[:x], p[:y]) elseif p[:linetype] == :scatter GR.polymarker(p[:x], p[:y]) + else + println("TODO: add support for linetype $(p[:linetype])") end end @@ -131,6 +147,7 @@ function gr_display(plt::Plot{GRPackage}) GR.setlinewidth(1) GR.drawrect(px - 0.06, px + w + 0.02, py + 0.03, py - 0.03 * length(plt.seriesargs)) haskey(d, :linewidth) && GR.setlinewidth(d[:linewidth]) + GR.uselinespec(" ") for p in plt.seriesargs GR.uselinespec("") if p[:linetype] == :path @@ -155,6 +172,9 @@ end function _add_series(::GRPackage, plt::Plot; kw...) d = Dict(kw) + if d[:markershape] == :none + d[:markershape] = :ellipse + end push!(plt.seriesargs, d) plt end @@ -188,16 +208,14 @@ end # ---------------------------------------------------------------- -# accessors for x/y data - function Base.getindex(plt::Plot{GRPackage}, i::Int) - series = plt.o.lines[i] - series.x, series.y + d = plt.seriesargs[i] + d[:x], d[:y] end - + function Base.setindex!(plt::Plot{GRPackage}, xy::Tuple, i::Integer) - series = plt.o.lines[i] - series.x, series.y = xy + d = plt.seriesargs[i] + d[:x], d[:y] = xy plt end @@ -205,6 +223,7 @@ end function _create_subplot(subplt::Subplot{GRPackage}, isbefore::Bool) # TODO: build the underlying Subplot object. this is where you might layout the panes within a GUI window, for example + true end function _expand_limits(lims, plt::Plot{GRPackage}, isx::Bool) @@ -218,7 +237,8 @@ end # ---------------------------------------------------------------- function Base.writemime(io::IO, ::MIME"image/png", plt::PlottingObject{GRPackage}) - # TODO: write a png to io + isijulia() && return + println("TODO: write a png to io") end function Base.display(::PlotsDisplay, plt::Plot{GRPackage}) diff --git a/src/backends/supported.jl b/src/backends/supported.jl index 1fdea586..76b69c08 100644 --- a/src/backends/supported.jl +++ b/src/backends/supported.jl @@ -234,10 +234,11 @@ supportedArgs(::GRPackage) = [ ] supportedAxes(::GRPackage) = _allAxes supportedTypes(::GRPackage) = [:none, :line, :path, :steppre, :steppost, :sticks, - :scatter, :heatmap, :hexbin, :hist, :density, :bar, - :hline, :vline, :contour, :path3d, :scatter3d, :surface, :wireframe] + :scatter, :heatmap, :hexbin, :hist, :density, :bar, + :hline, :vline, :contour, :path3d, :scatter3d, :surface, + :wireframe, :ohlc, :pie] supportedStyles(::GRPackage) = [:auto, :solid, :dash, :dot, :dashdot] -supportedMarkers(::GRPackage) = [:none, :ellipse, :rect, :diamond, :utriangle, :dtriangle, :pentagon, :cross, :xcross, :star5] +supportedMarkers(::GRPackage) = vcat([:none, :ellipse, :rect, :diamond, :utriangle, :dtriangle, :pentagon, :hexagon, :cross, :xcross, :star5], Shape) supportedScales(::GRPackage) = [:identity, :log10] subplotSupported(::GRPackage) = true From 003d39c8cd3d31fbd1c2bec8bc5c7eba691d1cc8 Mon Sep 17 00:00:00 2001 From: Josef Heinen Date: Thu, 7 Jan 2016 11:37:04 +0100 Subject: [PATCH 02/14] Added support for inline graphics (IJulia) --- src/backends/gr.jl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/backends/gr.jl b/src/backends/gr.jl index 50d296b1..da55aee8 100644 --- a/src/backends/gr.jl +++ b/src/backends/gr.jl @@ -166,6 +166,7 @@ function gr_display(plt::Plot{GRPackage}) end function _create_plot(pkg::GRPackage; kw...) + isijulia() && GR.inline("png") d = Dict(kw) Plot(nothing, pkg, 0, d, Dict[]) end @@ -236,9 +237,10 @@ end # ---------------------------------------------------------------- -function Base.writemime(io::IO, ::MIME"image/png", plt::PlottingObject{GRPackage}) - isijulia() && return - println("TODO: write a png to io") +function Base.writemime(io::IO, m::MIME"image/png", plt::PlottingObject{GRPackage}) + gr_display(plt) + GR.emergencyclosegks() + write(io, readall("gks.png")) end function Base.display(::PlotsDisplay, plt::Plot{GRPackage}) From cb0020c6292710df12f1276f33182bc4b9fe25f0 Mon Sep 17 00:00:00 2001 From: Josef Heinen Date: Thu, 7 Jan 2016 14:28:08 +0100 Subject: [PATCH 03/14] Fixed problem with uninitialized strings --- src/backends/gr.jl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backends/gr.jl b/src/backends/gr.jl index da55aee8..e12eda6d 100644 --- a/src/backends/gr.jl +++ b/src/backends/gr.jl @@ -83,19 +83,19 @@ function gr_display(plt::Plot{GRPackage}) GR.axes(xtick, ytick, xorg[1], yorg[1], majorx, majory, ticksize) GR.axes(xtick, ytick, xorg[2], yorg[2], -majorx, -majory, -ticksize) - if haskey(d, :title) + 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.restorestate() end - if haskey(d, :xlabel) + if get(d, :xlabel, "") != "" GR.savestate() GR.settextalign(GR.TEXT_HALIGN_CENTER, GR.TEXT_VALIGN_BOTTOM) GR.text(0.5, 0, d[:xlabel]) GR.restorestate() end - if haskey(d, :ylabel) + if get(d, :ylabel, "") != "" GR.savestate() GR.settextalign(GR.TEXT_HALIGN_CENTER, GR.TEXT_VALIGN_TOP) GR.setcharup(-1, 0) From 2c2a36ce34387bd805a853433b7b4dc345304e36 Mon Sep 17 00:00:00 2001 From: Josef Heinen Date: Fri, 8 Jan 2016 11:56:20 +0100 Subject: [PATCH 04/14] Use Plots predefined colors --- src/backends/gr.jl | 46 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/src/backends/gr.jl b/src/backends/gr.jl index e12eda6d..9c3f09c1 100644 --- a/src/backends/gr.jl +++ b/src/backends/gr.jl @@ -10,6 +10,11 @@ const gr_markertype = Dict( :utriangle => -3, :dtriangle => -5, :pentagon => -14, :hexagon => 3, :cross => 2, :xcross => 5, :star5 => 3 ) +function gr_getcolorind(v) + c = getColor(v) + return convert(Int, GR.inqcolorfromrgb(c.r, c.g, c.b)) +end + function gr_display(plt::Plot{GRPackage}) d = plt.plotargs @@ -105,25 +110,21 @@ function gr_display(plt::Plot{GRPackage}) GR.savestate() haskey(d, :linewidth) && GR.setlinewidth(d[:linewidth]) - haskey(d, :linestyle) && GR.setlinetype(gr_linetype[d[:linestyle]]) if haskey(d, :markersize) typeof(d[:markersize]) <: Number && GR.setmarkersize(d[:markersize] / 4.0) else println("TODO: multiple marker sizes") end - if haskey(d, :markershape) - typeof(d[:markershape]) == Symbol && GR.setmarkertype(gr_markertype[d[:markershape]]) - else - println("TODO: user-defined marker shapes") - end GR.settextalign(GR.TEXT_HALIGN_LEFT, GR.TEXT_VALIGN_HALF) - GR.uselinespec(" ") for p in plt.seriesargs - GR.uselinespec("") if p[:linetype] == :path + haskey(p, :linecolor) && GR.setlinecolorind(gr_getcolorind(p[:linecolor])) + haskey(p, :linestyle) && GR.setlinetype(gr_linetype[p[:linestyle]]) GR.polyline(p[:x], p[:y]) elseif p[:linetype] == :scatter + haskey(p, :markercolor) && GR.setmarkercolorind(gr_getcolorind(p[:markercolor])) + haskey(p, :markershape) && GR.setmarkertype(gr_markertype[p[:markershape]]) GR.polymarker(p[:x], p[:y]) else println("TODO: add support for linetype $(p[:linetype])") @@ -134,8 +135,15 @@ function gr_display(plt::Plot{GRPackage}) GR.selntran(0) GR.setscale(0) w = 0 + i = 0 for p in plt.seriesargs - tbx, tby = GR.inqtext(0, 0, p[:label]) + if typeof(p[:label]) <: Array + i += 1 + lab = p[:label][i] + else + lab = p[:label] + end + tbx, tby = GR.inqtext(0, 0, lab) w = max(w, tbx[3]) end px = viewport[2] - 0.05 - w @@ -147,15 +155,24 @@ function gr_display(plt::Plot{GRPackage}) GR.setlinewidth(1) GR.drawrect(px - 0.06, px + w + 0.02, py + 0.03, py - 0.03 * length(plt.seriesargs)) haskey(d, :linewidth) && GR.setlinewidth(d[:linewidth]) - GR.uselinespec(" ") + i = 0 for p in plt.seriesargs - GR.uselinespec("") if p[:linetype] == :path + haskey(p, :linecolor) && GR.setlinecolorind(gr_getcolorind(p[:linecolor])) + haskey(p, :linestyle) && GR.setlinetype(gr_linetype[p[:linestyle]]) GR.polyline([px - 0.05, px - 0.01], [py, py]) elseif p[:linetype] == :scatter - GR.polymarker([px - 0.05, px - 0.01], [py, py]) + haskey(p, :markercolor) && GR.setmarkercolorind(gr_getcolorind(p[:markercolor])) + haskey(p, :markershape) && GR.setmarkertype(gr_markertype[p[:markershape]]) + GR.polymarker([px - 0.04, px - 0.02], [py, py]) end - GR.text(px, py, p[:label]) + if typeof(p[:label]) <: Array + i += 1 + lab = p[:label][i] + else + lab = p[:label] + end + GR.text(px, py, lab) py -= 0.03 end GR.selntran(1) @@ -199,7 +216,7 @@ function _update_plot(plt::Plot{GRPackage}, d::Dict) get(d, :yflip, false) && (scale |= GR.OPTION_FLIP_Y) plt.plotargs[:scale] = scale - for k in (:title, :xlabel, :ylabel, :linewidth, :linestyle, :markersize, :markershape) + for k in (:title, :xlabel, :ylabel) haskey(d, k) && (plt.plotargs[k] = d[k]) end end @@ -238,6 +255,7 @@ end # ---------------------------------------------------------------- function Base.writemime(io::IO, m::MIME"image/png", plt::PlottingObject{GRPackage}) + isijulia() || return gr_display(plt) GR.emergencyclosegks() write(io, readall("gks.png")) From 81b59f9bc974866312868a50f7d70ca634ee44dd Mon Sep 17 00:00:00 2001 From: Josef Heinen Date: Fri, 8 Jan 2016 17:08:34 +0100 Subject: [PATCH 05/14] Implemented annotations --- src/backends/gr.jl | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/src/backends/gr.jl b/src/backends/gr.jl index 9c3f09c1..30b7213b 100644 --- a/src/backends/gr.jl +++ b/src/backends/gr.jl @@ -10,6 +10,13 @@ const gr_markertype = Dict( :utriangle => -3, :dtriangle => -5, :pentagon => -14, :hexagon => 3, :cross => 2, :xcross => 5, :star5 => 3 ) +const gr_halign = Dict(:left => 1, :hcenter => 2, :right => 3) +const gr_valign = Dict(:top => 1, :vcenter => 3, :bottom => 5) + +const gr_font_family = Dict( + "times" => 1, "helvetica" => 5, "courier" => 9, "bookman" => 14, + "newcenturyschlbk" => 18, "avantgarde" => 22, "palatino" => 26) + function gr_getcolorind(v) c = getColor(v) return convert(Int, GR.inqcolorfromrgb(c.r, c.g, c.b)) @@ -177,8 +184,27 @@ function gr_display(plt::Plot{GRPackage}) end GR.selntran(1) end - GR.restorestate() + + if haskey(d, :anns) + GR.savestate() + for ann in d[:anns] + x, y, val = ann + x, y = GR.wctondc(x, y) + alpha = val.font.rotation + family = lowercase(val.font.family) + GR.setcharheight(0.7 * val.font.pointsize / d[:size][2]) + GR.setcharup(sin(val.font.rotation), cos(val.font.rotation)) + if haskey(gr_font_family, family) + GR.settextfontprec(100 + gr_font_family[family], GR.TEXT_PRECISION_STRING) + end + GR.settextcolorind(gr_getcolorind(val.font.color)) + GR.settextalign(gr_halign[val.font.halign], gr_valign[val.font.valign]) + GR.text(x, y, val.str) + end + GR.restorestate() + end + GR.updatews() end @@ -198,8 +224,10 @@ function _add_series(::GRPackage, plt::Plot; kw...) end function _add_annotations{X,Y,V}(plt::Plot{GRPackage}, anns::AVec{@compat(Tuple{X,Y,V})}) - for ann in anns - # TODO: add the annotation to the plot + if haskey(plt.plotargs, :anns) + append!(plt.plotargs[:anns], anns) + else + plt.plotargs[:anns] = anns end end From e5a864a760b69d0c8e2cb348bcf8992018258b24 Mon Sep 17 00:00:00 2001 From: Josef Heinen Date: Sat, 9 Jan 2016 14:05:02 +0100 Subject: [PATCH 06/14] Implemented filled backgrounds --- src/backends/gr.jl | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/backends/gr.jl b/src/backends/gr.jl index 30b7213b..58472bd6 100644 --- a/src/backends/gr.jl +++ b/src/backends/gr.jl @@ -86,6 +86,13 @@ function gr_display(plt::Plot{GRPackage}) GR.setviewport(viewport[1], viewport[2], viewport[3], viewport[4]) GR.setwindow(xmin, xmax, ymin, ymax) + if 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) charheight = 0.03 * (viewport[4] - viewport[3]) @@ -125,6 +132,7 @@ function gr_display(plt::Plot{GRPackage}) GR.settextalign(GR.TEXT_HALIGN_LEFT, GR.TEXT_VALIGN_HALF) for p in plt.seriesargs + #haskey(p, :fillrange) && println("TODO: fill between") if p[:linetype] == :path haskey(p, :linecolor) && GR.setlinecolorind(gr_getcolorind(p[:linecolor])) haskey(p, :linestyle) && GR.setlinetype(gr_linetype[p[:linestyle]]) From d71c3ecd8621bec3e65cedbcd0051500cf08a752 Mon Sep 17 00:00:00 2001 From: Josef Heinen Date: Sun, 10 Jan 2016 19:05:16 +0100 Subject: [PATCH 07/14] Added support for multiple marker colors / sizes --- src/backends/gr.jl | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/src/backends/gr.jl b/src/backends/gr.jl index 58472bd6..0d694206 100644 --- a/src/backends/gr.jl +++ b/src/backends/gr.jl @@ -124,23 +124,42 @@ function gr_display(plt::Plot{GRPackage}) GR.savestate() haskey(d, :linewidth) && GR.setlinewidth(d[:linewidth]) - if haskey(d, :markersize) - typeof(d[:markersize]) <: Number && GR.setmarkersize(d[:markersize] / 4.0) - else - println("TODO: multiple marker sizes") - end GR.settextalign(GR.TEXT_HALIGN_LEFT, GR.TEXT_VALIGN_HALF) for p in plt.seriesargs - #haskey(p, :fillrange) && println("TODO: fill between") if p[:linetype] == :path + if haskey(p, :fillcolor) + GR.setfillcolorind(gr_getcolorind(p[:fillcolor])) + GR.setfillintstyle(GR.INTSTYLE_SOLID) + end haskey(p, :linecolor) && GR.setlinecolorind(gr_getcolorind(p[:linecolor])) haskey(p, :linestyle) && GR.setlinetype(gr_linetype[p[:linestyle]]) + 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]) elseif p[:linetype] == :scatter haskey(p, :markercolor) && GR.setmarkercolorind(gr_getcolorind(p[:markercolor])) haskey(p, :markershape) && GR.setmarkertype(gr_markertype[p[:markershape]]) - GR.polymarker(p[:x], p[:y]) + if haskey(d, :markersize) + if typeof(d[:markersize]) <: Number + GR.setmarkersize(d[:markersize] / 4.0) + GR.polymarker(p[:x], p[:y]) + else + c = p[:markercolor] + GR.setcolormap(GR.COLORMAP_COOLWARM) + for i = 1:length(p[:x]) + if isa(c, ColorGradient) && p[:zcolor] != nothing + ci = round(Int, 1000 + p[:zcolor][i] * 255) + GR.setmarkercolorind(ci) + end + GR.setmarkersize(d[:markersize][i] / 4.0) + GR.polymarker([p[:x][i]], [p[:y][i]]) + end + end + else + GR.polymarker(p[:x], p[:y]) + end else println("TODO: add support for linetype $(p[:linetype])") end From 3e9a47a68344d4f35228a8f487270052bb152bc7 Mon Sep 17 00:00:00 2001 From: Josef Heinen Date: Mon, 11 Jan 2016 18:16:31 +0100 Subject: [PATCH 08/14] Changed default colormap --- src/backends/gr.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backends/gr.jl b/src/backends/gr.jl index 0d694206..36213dc2 100644 --- a/src/backends/gr.jl +++ b/src/backends/gr.jl @@ -147,7 +147,7 @@ function gr_display(plt::Plot{GRPackage}) GR.polymarker(p[:x], p[:y]) else c = p[:markercolor] - GR.setcolormap(GR.COLORMAP_COOLWARM) + GR.setcolormap(-GR.COLORMAP_GLOWING) for i = 1:length(p[:x]) if isa(c, ColorGradient) && p[:zcolor] != nothing ci = round(Int, 1000 + p[:zcolor][i] * 255) From b4eb0b6b41533cec3cd682832aadbfc7998e47f3 Mon Sep 17 00:00:00 2001 From: Josef Heinen Date: Tue, 12 Jan 2016 16:33:07 +0100 Subject: [PATCH 09/14] Added histogram output --- src/backends/gr.jl | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/src/backends/gr.jl b/src/backends/gr.jl index 36213dc2..b635a383 100644 --- a/src/backends/gr.jl +++ b/src/backends/gr.jl @@ -46,7 +46,11 @@ function gr_display(plt::Plot{GRPackage}) xmin = ymin = typemax(Float64) xmax = ymax = typemin(Float64) for p in plt.seriesargs - x, y = p[:x], p[:y] + if p[:linetype] == :hist + x, y = Base.hist(p[:y]) + else + x, y = p[:x], p[:y] + end xmin = min(minimum(x), xmin) xmax = max(maximum(x), xmax) # catch exception for OHLC vectors @@ -126,6 +130,8 @@ function gr_display(plt::Plot{GRPackage}) haskey(d, :linewidth) && GR.setlinewidth(d[:linewidth]) GR.settextalign(GR.TEXT_HALIGN_LEFT, GR.TEXT_VALIGN_HALF) + legend = false + for p in plt.seriesargs if p[:linetype] == :path if haskey(p, :fillcolor) @@ -138,6 +144,7 @@ function gr_display(plt::Plot{GRPackage}) 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]) + legend = true elseif p[:linetype] == :scatter haskey(p, :markercolor) && GR.setmarkercolorind(gr_getcolorind(p[:markercolor])) haskey(p, :markershape) && GR.setmarkertype(gr_markertype[p[:markershape]]) @@ -160,12 +167,24 @@ function gr_display(plt::Plot{GRPackage}) else GR.polymarker(p[:x], p[:y]) end + legend = true + elseif p[:linetype] == :hist + h = Base.hist(p[:y]) + x, y = float(collect(h[1])), float(h[2]) + for i = 2:length(y) + GR.setfillcolorind(gr_getcolorind(p[:fillcolor])) + GR.setfillintstyle(GR.INTSTYLE_SOLID) + GR.fillrect(x[i-1], x[i], ymin, y[i]) + GR.setfillcolorind(1) + GR.setfillintstyle(GR.INTSTYLE_HOLLOW) + GR.fillrect(x[i-1], x[i], ymin, y[i]) + end else println("TODO: add support for linetype $(p[:linetype])") end end - if d[:legend] + if d[:legend] && legend GR.selntran(0) GR.setscale(0) w = 0 From baf33609afb66fe39136ea803e11019e99e8b7be Mon Sep 17 00:00:00 2001 From: Josef Heinen Date: Thu, 14 Jan 2016 15:50:48 +0100 Subject: [PATCH 10/14] Allow combination of lines and markers --- src/backends/gr.jl | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/backends/gr.jl b/src/backends/gr.jl index b635a383..5a6c9d3d 100644 --- a/src/backends/gr.jl +++ b/src/backends/gr.jl @@ -6,7 +6,7 @@ const gr_linetype = Dict( :dashdotdot => -1 ) const gr_markertype = Dict( - :auto => 1, :ellipse => -1, :rect => -7, :diamond => -13, + :auto => 1, :none => 1, :ellipse => -1, :rect => -7, :diamond => -13, :utriangle => -3, :dtriangle => -5, :pentagon => -14, :hexagon => 3, :cross => 2, :xcross => 5, :star5 => 3 ) @@ -145,7 +145,8 @@ function gr_display(plt::Plot{GRPackage}) end GR.polyline(p[:x], p[:y]) legend = true - elseif p[:linetype] == :scatter + end + if p[:linetype] == :scatter || p[:markershape] != :none haskey(p, :markercolor) && GR.setmarkercolorind(gr_getcolorind(p[:markercolor])) haskey(p, :markershape) && GR.setmarkertype(gr_markertype[p[:markershape]]) if haskey(d, :markersize) @@ -179,7 +180,10 @@ function gr_display(plt::Plot{GRPackage}) GR.setfillintstyle(GR.INTSTYLE_HOLLOW) GR.fillrect(x[i-1], x[i], ymin, y[i]) end - else + elseif p[:linetype] in [:line, :steppre, :steppost, :sticks, + :heatmap, :hexbin, :density, :bar, :hline, :vline, + :contour, :path3d, :scatter3d, :surface, + :wireframe, :ohlc, :pie] println("TODO: add support for linetype $(p[:linetype])") end end @@ -204,6 +208,7 @@ function gr_display(plt::Plot{GRPackage}) GR.setfillintstyle(GR.INTSTYLE_SOLID) GR.setfillcolorind(0) GR.fillrect(px - 0.06, px + w + 0.02, py + 0.03, py - 0.03 * length(plt.seriesargs)) + GR.setlinetype(1) GR.setlinecolorind(1) GR.setlinewidth(1) GR.drawrect(px - 0.06, px + w + 0.02, py + 0.03, py - 0.03 * length(plt.seriesargs)) @@ -214,7 +219,8 @@ function gr_display(plt::Plot{GRPackage}) haskey(p, :linecolor) && GR.setlinecolorind(gr_getcolorind(p[:linecolor])) haskey(p, :linestyle) && GR.setlinetype(gr_linetype[p[:linestyle]]) GR.polyline([px - 0.05, px - 0.01], [py, py]) - elseif p[:linetype] == :scatter + end + if p[:linetype] == :scatter || p[:markershape] != :none haskey(p, :markercolor) && GR.setmarkercolorind(gr_getcolorind(p[:markercolor])) haskey(p, :markershape) && GR.setmarkertype(gr_markertype[p[:markershape]]) GR.polymarker([px - 0.04, px - 0.02], [py, py]) @@ -262,9 +268,6 @@ end function _add_series(::GRPackage, plt::Plot; kw...) d = Dict(kw) - if d[:markershape] == :none - d[:markershape] = :ellipse - end push!(plt.seriesargs, d) plt end From 054a99ca3823192ee9ed108b7043c1f59154bbe3 Mon Sep 17 00:00:00 2001 From: Josef Heinen Date: Sat, 16 Jan 2016 13:23:23 +0100 Subject: [PATCH 11/14] Added horizontal/vertical linetype --- src/backends/gr.jl | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/backends/gr.jl b/src/backends/gr.jl index 5a6c9d3d..ccc87d47 100644 --- a/src/backends/gr.jl +++ b/src/backends/gr.jl @@ -180,8 +180,18 @@ function gr_display(plt::Plot{GRPackage}) GR.setfillintstyle(GR.INTSTYLE_HOLLOW) GR.fillrect(x[i-1], x[i], ymin, y[i]) end + elseif p[:linetype] in [:hline, :vline] + haskey(p, :linecolor) && GR.setlinecolorind(gr_getcolorind(p[:linecolor])) + haskey(p, :linestyle) && GR.setlinetype(gr_linetype[p[:linestyle]]) + for xy in p[:y] + if p[:linetype] == :hline + GR.polyline([xmin, xmax], [xy, xy]) + else + GR.polyline([xy, xy], [ymin, ymax]) + end + end elseif p[:linetype] in [:line, :steppre, :steppost, :sticks, - :heatmap, :hexbin, :density, :bar, :hline, :vline, + :heatmap, :hexbin, :density, :bar, :contour, :path3d, :scatter3d, :surface, :wireframe, :ohlc, :pie] println("TODO: add support for linetype $(p[:linetype])") From da9fdb356c04b5a25edc91b9874b744aa90c4f28 Mon Sep 17 00:00:00 2001 From: Josef Heinen Date: Sat, 16 Jan 2016 13:53:22 +0100 Subject: [PATCH 12/14] Added support for bar plots --- src/backends/gr.jl | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/backends/gr.jl b/src/backends/gr.jl index ccc87d47..76b711f8 100644 --- a/src/backends/gr.jl +++ b/src/backends/gr.jl @@ -46,7 +46,9 @@ function gr_display(plt::Plot{GRPackage}) xmin = ymin = typemax(Float64) xmax = ymax = typemin(Float64) for p in plt.seriesargs - if p[:linetype] == :hist + if p[:linetype] == :bar + x, y = 1:length(p[:y]), p[:y] + elseif p[:linetype] == :hist x, y = Base.hist(p[:y]) else x, y = p[:x], p[:y] @@ -169,6 +171,16 @@ function gr_display(plt::Plot{GRPackage}) GR.polymarker(p[:x], p[:y]) end legend = true + elseif p[:linetype] == :bar + y = p[:y] + for i = 1:length(y) + GR.setfillcolorind(gr_getcolorind(p[:fillcolor])) + GR.setfillintstyle(GR.INTSTYLE_SOLID) + GR.fillrect(i-0.4, i+0.4, max(0, ymin), y[i]) + GR.setfillcolorind(1) + GR.setfillintstyle(GR.INTSTYLE_HOLLOW) + GR.fillrect(i-0.4, i+0.4, max(0, ymin), y[i]) + end elseif p[:linetype] == :hist h = Base.hist(p[:y]) x, y = float(collect(h[1])), float(h[2]) @@ -191,7 +203,7 @@ function gr_display(plt::Plot{GRPackage}) end end elseif p[:linetype] in [:line, :steppre, :steppost, :sticks, - :heatmap, :hexbin, :density, :bar, + :heatmap, :hexbin, :density, :contour, :path3d, :scatter3d, :surface, :wireframe, :ohlc, :pie] println("TODO: add support for linetype $(p[:linetype])") From 2e8dd738225742403f59cce1a06c6ecf0f077d1d Mon Sep 17 00:00:00 2001 From: Josef Heinen Date: Sat, 16 Jan 2016 15:20:16 +0100 Subject: [PATCH 13/14] Added more line plots --- src/backends/gr.jl | 39 +++++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/src/backends/gr.jl b/src/backends/gr.jl index 76b711f8..9b643250 100644 --- a/src/backends/gr.jl +++ b/src/backends/gr.jl @@ -135,20 +135,46 @@ function gr_display(plt::Plot{GRPackage}) legend = false for p in plt.seriesargs + if p[:linetype] in [:path, :line, :steppre, :steppost, :sticks, :hline, :vline] + haskey(p, :linecolor) && GR.setlinecolorind(gr_getcolorind(p[:linecolor])) + haskey(p, :linestyle) && GR.setlinetype(gr_linetype[p[:linestyle]]) + end if p[:linetype] == :path if haskey(p, :fillcolor) GR.setfillcolorind(gr_getcolorind(p[:fillcolor])) GR.setfillintstyle(GR.INTSTYLE_SOLID) end - haskey(p, :linecolor) && GR.setlinecolorind(gr_getcolorind(p[:linecolor])) - haskey(p, :linestyle) && GR.setlinetype(gr_linetype[p[:linestyle]]) 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]) legend = true end - if p[:linetype] == :scatter || p[:markershape] != :none + if p[:linetype] == :line + GR.polyline(p[:x], p[:y]) + legend = true + elseif p[:linetype] in [:steppre, :steppost] + x = [p[:x][1]] + y = [p[:y][1]] + n = length(p[:x]) + for i = 2:n + if p[:linetype] == :steppre + x = [x; p[:x][i-1]; p[:x][i]] + y = [y; p[:y][i]; p[:y][i]] + else + x = [x; p[:x][i]; p[:x][i]] + y = [y; p[:y][i-1]; p[:y][i]] + end + end + GR.polyline(x, y) + legend = true + elseif p[:linetype] == :sticks + x, y = p[:x], p[:y] + for i = 1:length(y) + GR.polyline([x[i], x[i]], [ymin, y[i]]) + end + legend = true + elseif p[:linetype] == :scatter || p[:markershape] != :none haskey(p, :markercolor) && GR.setmarkercolorind(gr_getcolorind(p[:markercolor])) haskey(p, :markershape) && GR.setmarkertype(gr_markertype[p[:markershape]]) if haskey(d, :markersize) @@ -193,8 +219,6 @@ function gr_display(plt::Plot{GRPackage}) GR.fillrect(x[i-1], x[i], ymin, y[i]) end elseif p[:linetype] in [:hline, :vline] - haskey(p, :linecolor) && GR.setlinecolorind(gr_getcolorind(p[:linecolor])) - haskey(p, :linestyle) && GR.setlinetype(gr_linetype[p[:linestyle]]) for xy in p[:y] if p[:linetype] == :hline GR.polyline([xmin, xmax], [xy, xy]) @@ -202,8 +226,7 @@ function gr_display(plt::Plot{GRPackage}) GR.polyline([xy, xy], [ymin, ymax]) end end - elseif p[:linetype] in [:line, :steppre, :steppost, :sticks, - :heatmap, :hexbin, :density, + elseif p[:linetype] in [:heatmap, :hexbin, :density, :contour, :path3d, :scatter3d, :surface, :wireframe, :ohlc, :pie] println("TODO: add support for linetype $(p[:linetype])") @@ -237,7 +260,7 @@ function gr_display(plt::Plot{GRPackage}) haskey(d, :linewidth) && GR.setlinewidth(d[:linewidth]) i = 0 for p in plt.seriesargs - if p[:linetype] == :path + if p[:linetype] in [:path, :line, :steppre, :steppost, :sticks] haskey(p, :linecolor) && GR.setlinecolorind(gr_getcolorind(p[:linecolor])) haskey(p, :linestyle) && GR.setlinetype(gr_linetype[p[:linestyle]]) GR.polyline([px - 0.05, px - 0.01], [py, py]) From 14b856b0cf16ca973b743008dd32e4c9ad418657 Mon Sep 17 00:00:00 2001 From: Josef Heinen Date: Mon, 18 Jan 2016 17:25:59 +0100 Subject: [PATCH 14/14] Added support for two y-axis scales --- src/backends/gr.jl | 175 ++++++++++++++++++++++++++++----------------- 1 file changed, 110 insertions(+), 65 deletions(-) diff --git a/src/backends/gr.jl b/src/backends/gr.jl index 9b643250..0ea46483 100644 --- a/src/backends/gr.jl +++ b/src/backends/gr.jl @@ -6,7 +6,7 @@ const gr_linetype = Dict( :dashdotdot => -1 ) const gr_markertype = Dict( - :auto => 1, :none => 1, :ellipse => -1, :rect => -7, :diamond => -13, + :auto => 1, :none => -1, :ellipse => -1, :rect => -7, :diamond => -13, :utriangle => -3, :dtriangle => -5, :pentagon => -14, :hexagon => 3, :cross => 2, :xcross => 5, :star5 => 3 ) @@ -22,6 +22,15 @@ function gr_getcolorind(v) return convert(Int, GR.inqcolorfromrgb(c.r, c.g, c.b)) end +function gr_getaxisind(p) + axis = get(p, :axis, :none) + if axis in [:none, :left] + return 1 + else + return 2 + end +end + function gr_display(plt::Plot{GRPackage}) d = plt.plotargs @@ -43,70 +52,94 @@ function gr_display(plt::Plot{GRPackage}) viewport = [0.1 * ratio, 0.95 * ratio, 0.1, 0.95] end - xmin = ymin = typemax(Float64) - xmax = ymax = typemin(Float64) - for p in plt.seriesargs - if p[:linetype] == :bar - x, y = 1:length(p[:y]), p[:y] - elseif p[:linetype] == :hist - x, y = Base.hist(p[:y]) - else - x, y = p[:x], p[:y] - end - xmin = min(minimum(x), xmin) - xmax = max(maximum(x), xmax) - # catch exception for OHLC vectors - try - ymin = min(minimum(y), ymin) - ymax = max(maximum(y), ymax) - catch MethodError - ymin, ymax = 0, 1 + extrema = zeros(2, 4) + num_axes = 1 + + for axis = 1:2 + xmin = ymin = typemax(Float64) + xmax = ymax = typemin(Float64) + for p in plt.seriesargs + if axis == gr_getaxisind(p) + if axis == 2 + num_axes = 2 + end + if p[:linetype] == :bar + x, y = 1:length(p[:y]), p[:y] + elseif p[:linetype] == :hist + x, y = Base.hist(p[:y]) + else + x, y = p[:x], p[:y] + end + xmin = min(minimum(x), xmin) + xmax = max(maximum(x), xmax) + # catch exception for OHLC vectors + try + ymin = min(minimum(y), ymin) + ymax = max(maximum(y), ymax) + catch MethodError + ymin, ymax = 0, 1 + end + end end + extrema[axis,:] = [xmin, xmax, ymin, ymax] end + if num_axes == 2 + viewport[2] -= 0.05 + end + GR.setviewport(viewport[1], viewport[2], viewport[3], viewport[4]) + scale = d[:scale] - if scale & GR.OPTION_X_LOG == 0 - xmin, xmax = GR.adjustlimits(xmin, xmax) - majorx = 5 - xtick = GR.tick(xmin, xmax) / majorx - else - xtick = majorx = 1 - end - if scale & GR.OPTION_Y_LOG == 0 - ymin, ymax = GR.adjustlimits(ymin, ymax) - majory = 5 - ytick = GR.tick(ymin, ymax) / majory - else - ytick = majory = 1 - end - if scale & GR.OPTION_FLIP_X == 0 - xorg = (xmin, xmax) - else - xorg = (xmax, xmin) - end - if scale & GR.OPTION_FLIP_Y == 0 - yorg = (ymin, ymax) - else - yorg = (ymax, ymin) - end + for axis = 1:num_axes + xmin, xmax, ymin, ymax = extrema[axis,:] + if scale & GR.OPTION_X_LOG == 0 + xmin, xmax = GR.adjustlimits(xmin, xmax) + majorx = 5 + xtick = GR.tick(xmin, xmax) / majorx + else + xtick = majorx = 1 + end + if scale & GR.OPTION_Y_LOG == 0 + ymin, ymax = GR.adjustlimits(ymin, ymax) + majory = 5 + ytick = GR.tick(ymin, ymax) / majory + else + ytick = majory = 1 + end + if scale & GR.OPTION_FLIP_X == 0 + xorg = (xmin, xmax) + else + xorg = (xmax, xmin) + end + if scale & GR.OPTION_FLIP_Y == 0 + yorg = (ymin, ymax) + else + yorg = (ymax, ymin) + end - GR.setviewport(viewport[1], viewport[2], viewport[3], viewport[4]) - GR.setwindow(xmin, xmax, ymin, ymax) - if 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) + 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) - charheight = 0.03 * (viewport[4] - viewport[3]) - GR.setcharheight(charheight) - GR.grid(xtick, ytick, 0, 0, majorx, majory) - ticksize = 0.0125 * (viewport[2] - viewport[1]) - GR.axes(xtick, ytick, xorg[1], yorg[1], majorx, majory, ticksize) - GR.axes(xtick, ytick, xorg[2], yorg[2], -majorx, -majory, -ticksize) + charheight = 0.03 * (viewport[4] - viewport[3]) + GR.setcharheight(charheight) + GR.grid(xtick, ytick, 0, 0, majorx, majory) + ticksize = 0.0125 * (viewport[2] - viewport[1]) + 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) + elseif axis == 1 + GR.axes(xtick, ytick, xorg[1], yorg[1], majorx, majory, ticksize) + else + GR.axes(xtick, ytick, xorg[2], yorg[2], -majorx, majory, -ticksize) + end + end if get(d, :title, "") != "" GR.savestate() @@ -127,6 +160,13 @@ function gr_display(plt::Plot{GRPackage}) GR.text(0, 0.5 * (viewport[3] + viewport[4]), d[:ylabel]) GR.restorestate() end + if get(d, :yrightlabel, "") != "" + GR.savestate() + GR.settextalign(GR.TEXT_HALIGN_CENTER, GR.TEXT_VALIGN_TOP) + GR.setcharup(1, 0) + GR.text(1, 0.5 * (viewport[3] + viewport[4]), d[:yrightlabel]) + GR.restorestate() + end GR.savestate() haskey(d, :linewidth) && GR.setlinewidth(d[:linewidth]) @@ -135,6 +175,8 @@ function gr_display(plt::Plot{GRPackage}) legend = false for p in plt.seriesargs + xmin, xmax, ymin, ymax = extrema[gr_getaxisind(p),:] + GR.setwindow(xmin, xmax, ymin, ymax) if p[:linetype] in [:path, :line, :steppre, :steppost, :sticks, :hline, :vline] haskey(p, :linecolor) && GR.setlinecolorind(gr_getcolorind(p[:linecolor])) haskey(p, :linestyle) && GR.setlinetype(gr_linetype[p[:linestyle]]) @@ -154,17 +196,20 @@ function gr_display(plt::Plot{GRPackage}) GR.polyline(p[:x], p[:y]) legend = true elseif p[:linetype] in [:steppre, :steppost] - x = [p[:x][1]] - y = [p[:y][1]] n = length(p[:x]) + x = zeros(2*n + 1) + y = zeros(2*n + 1) + x[1], y[1] = p[:x][1], p[:y][1] + j = 2 for i = 2:n if p[:linetype] == :steppre - x = [x; p[:x][i-1]; p[:x][i]] - y = [y; p[:y][i]; p[:y][i]] + x[j], x[j+1] = p[:x][i-1], p[:x][i] + y[j], y[j+1] = p[:y][i], p[:y][i] else - x = [x; p[:x][i]; p[:x][i]] - y = [y; p[:y][i-1]; p[:y][i]] + x[j], x[j+1] = p[:x][i], p[:x][i] + y[j], y[j+1] = p[:y][i-1], p[:y][i] end + j += 2 end GR.polyline(x, y) legend = true