bump version

[skip ci]
don't add .tex to .tikz (#2607 )
2020-04-21 18:53:52 +02:00 · 2020-04-21 17:47:28 +02:00 · 2020-04-21 16:53:28 +02:00 · 2020-04-21 21:35:37 +09:00 · 2020-04-20 19:30:32 +02:00 · 2020-04-21 01:35:07 +09:00
6 changed files with 52 additions and 49 deletions
@@ -1,7 +1,7 @@
 name = "Plots"
 uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
 author = ["Tom Breloff (@tbreloff)"]
-version = "1.0.11"
+version = "1.0.13"

 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
@@ -462,11 +462,12 @@ function axis_limits(sp, letter, should_widen = default_should_widen(sp[Symbol(l
    lims = axis[:lims]
    has_user_lims = (isa(lims, Tuple) || isa(lims, AVec)) && length(lims) == 2
    if has_user_lims
-        if isfinite(lims[1])
-            amin = lims[1]
+        lmin, lmax = lims
+        if lmin != :auto && isfinite(lmin)
+            amin = lmin
        end
-        if isfinite(lims[2])
-            amax = lims[2]
+        if lmax != :auto && isfinite(lmax)
+            amax = lmax
        end
    end
    if amax <= amin && isfinite(amin)
@@ -40,11 +40,9 @@ _show(io::IO, ::MIME"text/html", plt::Plot{PlotlyJSBackend}) = write(io, standal

 _display(plt::Plot{PlotlyJSBackend}) = display(plotlyjs_syncplot(plt))

-@require WebIO = "0f1e0344-ec1d-5b48-a673-e5cf874b6c29" begin
-    function WebIO.render(plt::Plot{PlotlyJSBackend})
-        plt_html = sprint(show, MIME("text/html"), plt)
-        return WebIO.render(WebIO.dom"div"(innerHTML=plt_html))
-    end
+function PlotlyJS.WebIO.render(plt::Plot{PlotlyJSBackend})
+    plt_html = sprint(show, MIME("text/html"), plt)
+    return PlotlyJS.WebIO.render(PlotlyJS.WebIO.dom"div"(innerHTML=plt_html))
 end

 function closeall(::PlotlyJSBackend)
@@ -229,11 +229,6 @@ function fix_xy_lengths!(plt::Plot{PyPlotBackend}, series::Series)
    end
 end

-py_linecolor(series::Series)          = py_color(series[:linecolor])
-py_markercolor(series::Series)        = py_color(series[:markercolor])
-py_markerstrokecolor(series::Series)  = py_color(series[:markerstrokecolor])
-py_fillcolor(series::Series)          = py_color(series[:fillcolor])
-
 py_linecolormap(series::Series)       = py_colormap(series[:linecolor])
 py_markercolormap(series::Series)     = py_colormap(series[:markercolor])
 py_fillcolormap(series::Series)       = py_colormap(series[:fillcolor])
@@ -486,8 +481,8 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
                        :arrowstyle => "simple,head_length=$(a.headlength),head_width=$(a.headwidth)",
                        :shrinkA => 0,
                        :shrinkB => 0,
-                        :edgecolor => py_linecolor(series),
-                        :facecolor => py_linecolor(series),
+                        :edgecolor => py_color(get_linecolor(series)),
+                        :facecolor => py_color(get_linecolor(series)),
                        :linewidth => py_thickness_scale(plt, get_linewidth(series)),
                        :linestyle => py_linestyle(st, get_linestyle(series)),
                    )
@@ -533,11 +528,11 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
            handle = []
            x,y = xyargs
            shapes = series[:markershape]
-            msc = py_markerstrokecolor(series)
+            msc = py_color(get_markerstrokecolor(series), get_markerstrokealpha(series))
            lw = py_thickness_scale(plt, series[:markerstrokewidth])
            for i=eachindex(y)
                if series[:marker_z] !== nothing
-                    extrakw[:c] = [py_color(get_markercolor(series, i))]
+                    extrakw[:c] = [py_color(get_markercolor(series, i), get_markercoloralpha(series, i))]
                end

                push!(handle, ax."scatter"(_cycle(x,i), _cycle(y,i);
@@ -545,7 +540,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
                    zorder = series[:series_plotindex] + 0.5,
                    marker = py_marker(_cycle(shapes,i)),
                    s =  py_thickness_scale(plt, _cycle(series[:markersize],i) .^ 2),
-                    facecolors = get_markercolor(series, i),
+                    facecolors = py_color(get_markercolor(series, i), get_markercoloralpha(series, i)),
                    edgecolors = msc,
                    linewidths = lw,
                    extrakw...
@@ -585,7 +580,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
                  zorder = series[:series_plotindex] + 0.5,
                  marker = prev_marker,
                  s = cur_scale_list,
-                  edgecolors = py_markerstrokecolor(series),
+                  edgecolors = py_color(get_markerstrokecolor(series), get_markerstrokealpha(series)),  # Do we need include i?
                  linewidths = py_thickness_scale(plt, series[:markerstrokewidth]),
                  facecolors = cur_color_list,
                  extrakw...
@@ -606,7 +601,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
                zorder = series[:series_plotindex] + 0.5,
                marker = prev_marker,
                s = cur_scale_list,
-                edgecolors = py_markerstrokecolor(series),
+                edgecolors = py_color(get_markerstrokecolor(series), get_markerstrokealpha(series)),
                linewidths = py_thickness_scale(plt, series[:markerstrokewidth]),
                facecolors = cur_color_list,
                extrakw...
@@ -621,7 +616,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
                zorder = series[:series_plotindex] + 0.5,
                marker = py_marker(series[:markershape]),
                s = py_thickness_scale(plt, series[:markersize] .^ 2),
-                edgecolors = py_markerstrokecolor(series),
+                edgecolors = py_color(get_markerstrokecolor(series), get_markerstrokealpha(series)),
                linewidths = py_thickness_scale(plt, series[:markerstrokewidth]),
                extrakw...
            )
@@ -635,7 +630,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
            zorder = series[:series_plotindex],
            gridsize = series[:bins],
            linewidths = py_thickness_scale(plt, series[:linewidth]),
-            edgecolors = py_linecolor(series),
+            edgecolors = py_color(get_linecolor(series)),
            cmap = py_fillcolormap(series),  # applies to the pcolorfast object
            extrakw...
        )
@@ -708,7 +703,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
                rstride = series[:stride][1],
                cstride = series[:stride][2],
                linewidth = py_thickness_scale(plt, series[:linewidth]),
-                edgecolor = py_linecolor(series),
+                edgecolor = py_color(get_linecolor(series)),
                extrakw...
            )
            push!(handles, handle)
@@ -734,7 +729,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
                zorder = series[:series_plotindex],
                cmap = py_fillcolormap(series),
                linewidth = py_thickness_scale(plt, series[:linewidth]),
-                edgecolor = py_linecolor(series),
+                edgecolor = py_color(get_linecolor(series)),
                extrakw...
            )
            push!(handles, handle)
@@ -1106,7 +1101,10 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
                ticks[2][ticks[1] .== 0] .= ""
            end
            axis[:ticks] != :native ? py_set_ticks(ax, ticks, letter) : nothing
-            pyaxis."set_tick_params"(direction = axis[:tick_direction] == :out ? "out" : "in")
+
+            intensity = 0.5  # This value corresponds to scaling of other grid elements
+            pyaxis."set_tick_params"(direction = axis[:tick_direction] == :out ? "out" : "in", width=py_thickness_scale(plt, intensity))
+
            getproperty(ax, Symbol("set_", letter, "label"))(axis[:guide])
            if get(axis.plotattributes, :flip, false)
                getproperty(ax, Symbol("invert_", letter, "axis"))()
@@ -1308,25 +1306,29 @@ function py_add_legend(plt::Plot, sp::Subplot, ax)
            if should_add_to_legend(series)
                clims = get_clims(sp, series)
                # add a line/marker and a label
-                push!(handles, if series[:seriestype] == :shape || series[:fillrange] !== nothing
-                    pypatches."Patch"(
-                        edgecolor = py_color(single_color(get_linecolor(series, clims)), get_linealpha(series)),
-                        facecolor = py_color(single_color(get_fillcolor(series, clims)), get_fillalpha(series)),
-                        linewidth = py_thickness_scale(plt, clamp(get_linewidth(series), 0, 5)),
-                        linestyle = py_linestyle(series[:seriestype], get_linestyle(series))
-                    )
-                elseif series[:seriestype] in (:path, :straightline, :scatter)
-                    PyPlot.plt."Line2D"((0,1),(0,0),
-                        color = py_color(single_color(get_linecolor(series, clims)), get_linealpha(series)),
-                        linewidth = py_thickness_scale(plt, clamp(get_linewidth(series), 0, 5)),
-                        linestyle = py_linestyle(:path, get_linestyle(series)),
-                        marker = py_marker(_cycle(series[:markershape], 1)),
-                        markeredgecolor = py_color(single_color(get_markerstrokecolor(series)), get_markerstrokealpha(series)),
-                        markerfacecolor = py_color(single_color(get_markercolor(series, clims)), get_markeralpha(series))
-                    )
-                else
-                    series[:serieshandle][1]
-                end)
+                push!(handles,
+                    if series[:seriestype] == :shape || series[:fillrange] !== nothing
+                        pypatches."Patch"(
+                            edgecolor = py_color(single_color(get_linecolor(series, clims)), get_linealpha(series)),
+                            facecolor = py_color(single_color(get_fillcolor(series, clims)), get_fillalpha(series)),
+                            linewidth = py_thickness_scale(plt, clamp(get_linewidth(series), 0, 5)),
+                            linestyle = py_linestyle(series[:seriestype], get_linestyle(series))
+                        )
+                    elseif series[:seriestype] in (:path, :straightline, :scatter)
+                        PyPlot.plt."Line2D"((0,1),(0,0),
+                            color = py_color(single_color(get_linecolor(series, clims)), get_linealpha(series)),
+                            linewidth = py_thickness_scale(plt, clamp(get_linewidth(series), 0, 5)),
+                            linestyle = py_linestyle(:path, get_linestyle(series)),
+                            marker = py_marker(_cycle(series[:markershape], 1)),
+                            # markersize = py_thickness_scale(plt, series[:markersize]), # In case we decide that markersize needs to be scaled in the legend too
+                            markeredgecolor = py_color(single_color(get_markerstrokecolor(series)), get_markerstrokealpha(series)),
+                            markerfacecolor = py_color(single_color(get_markercolor(series, clims)), get_markeralpha(series)),
+                            markeredgewidth = py_thickness_scale(plt, series[:markerstrokewidth])
+                        )
+                    else
+                        series[:serieshandle][1]
+                    end
+                )
                push!(labels, series[:label])
            end
        end
@@ -1342,6 +1344,7 @@ function py_add_legend(plt::Plot, sp::Subplot, ax)
                facecolor = py_color(sp[:background_color_legend]),
                edgecolor = py_color(sp[:foreground_color_legend]),
                framealpha = alpha(plot_color(sp[:background_color_legend])),
+                fancybox = false  # makes the legend box square
            )
            frame = leg."get_frame"()
            frame."set_linewidth"(py_thickness_scale(plt, 1))
@@ -103,7 +103,7 @@ end
 function addExtension(fn::AbstractString, ext::AbstractString)
  try
    oldext = getExtension(fn)
-    if oldext == ext
+    if string(_savemap[oldext]) == ext
      return fn
    else
      return "$fn.$ext"
@@ -438,8 +438,9 @@ julia> plot(1:10)
 julia> annotate!([(7,3,"(7,3)"),(3,7,text("hey", 14, :left, :top, :green))])
 ```
 """
-annotate!(anns...; kw...)                                        = plot!(; annotation = collect(anns), kw...)
-annotate!(anns::AVec{T}; kw...) where {T<:Tuple}                 = plot!(; annotation = anns, kw...)
+annotate!(anns...; kw...)             = plot!(; annotation = anns, kw...)
+annotate!(anns::Tuple...; kw...)      = plot!(; annotation = collect(anns), kw...)
+annotate!(anns::AVec{<:Tuple}; kw...) = plot!(; annotation = anns, kw...)

 "Flip the current plots' x axis"
 xflip!(flip::Bool = true; kw...)                          = plot!(; xflip = flip, kw...)
Author	SHA1	Message	Date
Simon Christ	8ae8d74c42	bump version [skip ci]	2020-04-21 18:53:52 +02:00
Simon Christ	eba4d2442c	don't add .tex to .tikz (#2607 ) * don't add .tex to .tikz If we reach this point, we already checked if the extension is existent. This used to append `.tex` if saving as `.tikz` file, which is unwanted. * Update output.jl * convert symbol to string	2020-04-21 17:47:28 +02:00
Daniel Schwabeneder	d1938c5e94	Merge pull request #2608 from isentropic/isen-dev2 Make the legendbox square as in GR in pyplot	2020-04-21 16:53:28 +02:00
Zh	3dbe5cc3a2	Make the legendbox square as in GR	2020-04-21 21:35:37 +09:00
Daniel Schwabeneder	7a6617efe3	Merge pull request #2605 from isentropic/isen-dev Tick marks now scale according to thickness_scaling	2020-04-20 19:30:32 +02:00
Zh	123eb15434	Merge remote-tracking branch 'origin/isen-dev' into isen-dev	2020-04-21 01:35:07 +09:00
Zh	df13011bd3	Tick marks now scale properly with thickness_scaling	2020-04-21 01:34:11 +09:00
Zh	3368fd2c98	Tick marks now scale properly with thickness_scaling	2020-04-21 01:33:52 +09:00
Daniel Schwabeneder	5a78c492bc	Merge pull request #2602 from daschw/release bump version	2020-04-19 23:01:33 +02:00
Daniel Schwabeneder	8e98d1dfde	bump version [skip ci]	2020-04-19 23:00:24 +02:00
Simon Christ	2373dda3c4	allow :auto as limit (#2599 )	2020-04-19 17:05:04 +02:00
Daniel Schwabeneder	0456ddfe3a	Merge pull request #2594 from isentropic/isen-dev2 [pyplot] marker adjustments in the legend	2020-04-19 10:33:35 +02:00
Daniel Schwabeneder	fe0858ebcf	Merge pull request #2597 from daschw/annotations fix annotate! shorthands	2020-04-18 19:26:31 +02:00
Daniel Schwabeneder	6bc38eaea3	fix annotate! shorthands	2020-04-18 19:01:42 +02:00
Zh	43456b09f6	[pyplot] marker adjustments	2020-04-18 14:20:24 +09:00
Daniel Schwabeneder	fae1cb4884	Merge pull request #2588 from daschw/webio fix WebIO error for PlotlyJS	2020-04-16 16:54:40 +02:00
Simon Christ	9b4c66be9a	adjust markersize (#2589 ) * fix px to pt conversion for markers * fix test * bump version [skip ci] @JuliaRegistrator register	2020-04-16 15:13:21 +02:00
Daniel Schwabeneder	2d29ab7017	fix WebIO error for PlotlyJS	2020-04-16 13:22:36 +02:00
Daniel Schwabeneder	3b3a09302f	Merge pull request #2584 from isentropic/isen-dev2 Isen dev2	2020-04-16 09:59:29 +02:00
Zh	c01ee17d88	pyplot markercolor	2020-04-16 01:21:05 +09:00
Zh	8c9422f470	py_get<component>color removal; marker stroke, adjustments	2020-04-16 00:32:33 +09:00
Zh	7c88256ca4	Merge branch 'master' into isen-dev2	2020-04-15 23:33:39 +09:00
Zh	f5fe2692e2	Merge branch 'master' into isen-dev	2020-04-15 23:33:26 +09:00