Merge 7b78d99d992f84ab6258838d75408f8ee89a6fbb into 4860bf3f19bf3bbee252aa422c7a68a486b14bcb

src/backends.jl

@@ -6,6 +6,7 @@ const _backendType = Dict{Symbol, DataType}(:none => NoBackend)
 const _backendSymbol = Dict{DataType, Symbol}(NoBackend => :none)
 const _backends = Symbol[]
 const _initialized_backends = Set{Symbol}()
+const _default_backends = (:gr, :plotly)
 
 "Returns a list of supported backends"
 backends() = _backends
@@ -23,10 +24,11 @@ macro init_backend(s)
         export $sym
         $sym(; kw...) = (default(; kw...); backend(Symbol($str)))
         backend_name(::$T) = Symbol($str)
+        backend_package_name(pkg::$T) = backend_name(pkg) in _default_backends ? :Plots : Symbol("Plots", $(string(s)))
         push!(_backends, Symbol($str))
         _backendType[Symbol($str)] = $T
         _backendSymbol[$T] = Symbol($str)
-        include("backends/" * $str * ".jl")
+        # include("backends/" * $str * ".jl")
     end)
 end
 
@@ -135,30 +137,16 @@ CurrentBackend(sym::Symbol) = CurrentBackend(sym, _backend_instance(sym))
 function pickDefaultBackend()
     env_default = get(ENV, "PLOTS_DEFAULT_BACKEND", "")
     if env_default != ""
-        if env_default in keys(Pkg.installed())
         sym = Symbol(lowercase(env_default))
-            if haskey(_backendType, sym)
+        if sym in _default_backends
             return backend(sym)
         else
-                warn("You have set PLOTS_DEFAULT_BACKEND=$env_default but it is not a valid backend package.  Choose from:\n\t",
+            @warn("You have set PLOTS_DEFAULT_BACKEND=$env_default but it is not supported.")
-                     join(sort(_backends), "\n\t"))
-            end
-        else
-            warn("You have set PLOTS_DEFAULT_BACKEND=$env_default but it is not installed.")
-        end
-    end
-
-    # the ordering/inclusion of this package list is my semi-arbitrary guess at
-    # which one someone will want to use if they have the package installed...accounting for
-    # features, speed, and robustness
-    for pkgstr in ("GR", "PyPlot", "PlotlyJS", "PGFPlots", "UnicodePlots", "InspectDR", "GLVisualize")
-        if pkgstr in keys(Pkg.installed())
-            return backend(Symbol(lowercase(pkgstr)))
         end
     end
 
     # the default if nothing else is installed
-    backend(:plotly)
+    backend(:gr)
 end
 
 
@@ -174,24 +162,24 @@ function backend()
     pickDefaultBackend()
   end
 
-  sym = CURRENT_BACKEND.sym
+  # sym = CURRENT_BACKEND.sym
-  if !(sym in _initialized_backends)
+  # if !(sym in _initialized_backends)
-
+  #
-    # # initialize
+  #   # # initialize
-    # println("[Plots.jl] Initializing backend: ", sym)
+  #   # println("[Plots.jl] Initializing backend: ", sym)
-
+  #
-    inst = _backend_instance(sym)
+  #   inst = _backend_instance(sym)
-    try
+  #   try
-      _initialize_backend(inst)
+  #     _initialize_backend(inst)
-    catch err
+  #   catch err
-      warn("Couldn't initialize $sym.  (might need to install it?)")
+  #     warn("Couldn't initialize $sym.  (might need to install it?)")
-      add_backend(sym)
+  #     add_backend(sym)
-      rethrow(err)
+  #     rethrow(err)
-    end
+  #   end
-
+  #
-    push!(_initialized_backends, sym)
+  #   push!(_initialized_backends, sym)
-
+  #
-  end
+  # end
   CURRENT_BACKEND.pkg
 end
 
@@ -199,16 +187,29 @@ end
 Set the plot backend.
 """
 function backend(pkg::AbstractBackend)
+    if backend_package_name(pkg) in nameof.(collect(values(Base.loaded_modules)))
         CURRENT_BACKEND.sym = backend_name(pkg)
         warn_on_deprecated_backend(CURRENT_BACKEND.sym)
         CURRENT_BACKEND.pkg = pkg
+    else
+        @warn("To use the `:$(backend_name(pkg))` backend, run `using $(backend_package_name(pkg))`.")
+    end
     backend()
 end
 
 function backend(modname::Symbol)
+    if modname in _backends
+        bpn = backend_package_name(_backend_instance(modname))
+        if bpn in nameof.(collect(values(Base.loaded_modules)))
             warn_on_deprecated_backend(modname)
             CURRENT_BACKEND.sym = modname
             CURRENT_BACKEND.pkg = _backend_instance(modname)
+        else
+            @warn("To use the `:$modname` backend, run `using $bpn`.")
+        end
+    else
+        @warn("`:$modname` is not a supported Plots backend.")
+    end
     backend()
 end
 
@@ -216,7 +217,7 @@ const _deprecated_backends = [:qwt, :winston, :bokeh, :gadfly, :immerse]
 
 function warn_on_deprecated_backend(bsym::Symbol)
     if bsym in _deprecated_backends
-        warn("Backend $bsym has been deprecated.  It may not work as originally intended.")
+        @warn("Backend $bsym has been deprecated.  It may not work as originally intended.")
     end
 end
 
@@ -282,6 +283,15 @@ end
 @init_backend InspectDR
 @init_backend HDF5
 
+_attr = KW()
+_seriestype = KW()
+_marker = KW()
+_style = KW()
+_scale = KW()
+
+include("backends/gr.jl")
+include("backends/plotly.jl")
+
 # ---------------------------------------------------------
 
 # create the various `is_xxx_supported` and `supported_xxxs` methods
@@ -298,10 +308,12 @@ for s in (:attr, :seriestype, :marker, :style, :scale)
 
     for bend in backends()
         bend_type = typeof(_backend_instance(bend))
-        v = Symbol("_", bend, "_", s)
+
+        d = Symbol("_", s)
+        str = string(bend)
         @eval begin
-            $f(::$bend_type, $s::Symbol) = $s in $v
+            $f(::$bend_type, $s::Symbol) = $s in $d[$Symbol($str)]
-            $f2(::$bend_type) = $v
+            $f2(::$bend_type) = $d[$Symbol($str)]
         end
     end
 end

src/backends/gr.jl

@@ -2,12 +2,13 @@
 # https://github.com/jheinen/GR.jl
 
 # significant contributions by @jheinen
+import GR
 
 @require Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" begin
     Revise.track(Plots, joinpath(Pkg.dir("Plots"), "src", "backends", "gr.jl"))
 end
 
-const _gr_attr = merge_with_base_supported([
+_attr[:gr] = merge_with_base_supported([
     :annotations,
     :background_color_legend, :background_color_inside, :background_color_outside,
     :foreground_color_legend, :foreground_color_grid, :foreground_color_axis,
@@ -47,15 +48,15 @@ const _gr_attr = merge_with_base_supported([
     :camera,
     :contour_labels,
 ])
-const _gr_seriestype = [
+_seriestype[:gr] = [
     :path, :scatter, :straightline,
     :heatmap, :pie, :image,
     :contour, :path3d, :scatter3d, :surface, :wireframe,
     :shape
 ]
-const _gr_style = [:auto, :solid, :dash, :dot, :dashdot, :dashdotdot]
+_style[:gr] = [:auto, :solid, :dash, :dot, :dashdot, :dashdotdot]
-const _gr_marker = _allMarkers
+_marker[:gr] = _allMarkers
-const _gr_scale = [:identity, :log10]
+_scale[:gr] = [:identity, :log10]
 is_marker_supported(::GRBackend, shape::Shape) = true
 
 function add_backend_string(::GRBackend)
@@ -65,13 +66,6 @@ function add_backend_string(::GRBackend)
     """
 end
 
-function _initialize_backend(::GRBackend; kw...)
-    @eval begin
-        import GR
-        export GR
-    end
-end
-
 # --------------------------------------------------------------------------------------
 
 const gr_linetype = KW(

src/backends/plotly.jl

@@ -5,7 +5,9 @@
     Revise.track(Plots, joinpath(Pkg.dir("Plots"), "src", "backends", "plotly.jl"))
 end
 
-const _plotly_attr = merge_with_base_supported([
+using UUIDs
+
+_attr[:plotly] = merge_with_base_supported([
     :annotations,
     :background_color_legend, :background_color_inside, :background_color_outside,
     :foreground_color_legend, :foreground_color_guide,
@@ -48,17 +50,17 @@ const _plotly_attr = merge_with_base_supported([
     :contour_labels,
   ])
 
-const _plotly_seriestype = [
+_seriestype[:plotly] = [
     :path, :scatter, :pie, :heatmap,
     :contour, :surface, :wireframe, :path3d, :scatter3d, :shape, :scattergl,
     :straightline
 ]
-const _plotly_style = [:auto, :solid, :dash, :dot, :dashdot]
+_style[:plotly] = [:auto, :solid, :dash, :dot, :dashdot]
-const _plotly_marker = [
+_marker[:plotly] = [
     :none, :auto, :circle, :rect, :diamond, :utriangle, :dtriangle,
     :cross, :xcross, :pentagon, :hexagon, :octagon, :vline, :hline
 ]
-const _plotly_scale = [:identity, :log10]
+_scale[:plotly] = [:identity, :log10]
 is_subplot_supported(::PlotlyBackend) = true
 # is_string_supported(::PlotlyBackend) = true
 const _plotly_framestyles = [:box, :axes, :zerolines, :grid, :none]
@@ -720,7 +722,7 @@ function plotly_series_segments(series::Series, d_base::KW, x, y, z)
         (isa(series[:fillrange], AbstractVector) || isa(series[:fillrange], Tuple))
 
     segments = iter_segments(series)
-    d_outs = Vector{KW}((hasfillrange ? 2 : 1 ) * length(segments))
+    d_outs = Vector{KW}(undef, (hasfillrange ? 2 : 1 ) * length(segments))
 
     for (i,rng) in enumerate(segments)
         !isscatter && length(rng) < 2 && continue
@@ -906,7 +908,7 @@ function html_body(plt::Plot{PlotlyBackend}, style = nothing)
         w, h = plt[:size]
         style = "width:$(w)px;height:$(h)px;"
     end
-    uuid = Base.Random.uuid4()
+    uuid = UUIDs.uuid4()
     html = """
         <div id=\"$(uuid)\" style=\"$(style)\"></div>
         <script>

src/themes.jl

@@ -10,7 +10,7 @@ end
 
 function _get_defaults(s::Symbol)
     thm = PlotThemes._themes[s]
-    if :defaults in fieldnames(thm)
+    if :defaults in fieldnames(typeof(thm))
         return thm.defaults
     else # old PlotTheme type
         defaults = KW(