Replace AbstractPlotting.jl with Makie.jl (#122)

* Replace AbstractPlotting.jl with Makie.jl

* swap dep

Author: lorenzoh

Project.toml

@@ -4,7 +4,6 @@ authors = ["Lorenz Ohly", "Julia Community"]
 version = "0.1.0"
 
 [deps]
-AbstractPlotting = "537997a7-5e4e-5d89-9595-2241ea00577e"
 Animations = "27a7e980-b3e6-11e9-2bcd-0b925532e340"
 BSON = "fbb218c0-5317-5bc6-957e-2ee96dd4b1f0"
 Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
@@ -21,6 +20,7 @@ FluxTraining = "7bf95e4d-ca32-48da-9824-f0dc5310474f"
 JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
 LearnBase = "7f8f8fb0-2700-5f03-b4bd-41f8cfc144b6"
 MLDataPattern = "9920b226-0b2a-5f5f-9153-9aa70a013f8b"
+Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
 MosaicViews = "e94cdb99-869f-56ef-bcf0-1ae2bcbe0389"
 Parameters = "d96e819e-fc66-5662-9728-84c9c7592b0a"
 Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
@@ -31,7 +31,6 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
 
 [compat]
-AbstractPlotting = "0.17, 0.18"
 Animations = "0.4"
 BSON = "0.3"
 Colors = "0.12"

src/FastAI.jl

@@ -9,7 +9,7 @@ using Reexport
 @reexport using Flux
 
 using Animations
-using AbstractPlotting
+using Makie
 using Colors
 using DataAugmentation
 using DataAugmentation: getbounds, Bounds

src/plotting.jl

@@ -123,7 +123,7 @@ end
 # ## Utilities
 
 function imageaxis(f; kwargs...)
-    ax = AbstractPlotting.Axis(f; kwargs...)
+    ax = Makie.Axis(f; kwargs...)
     ax.aspect = DataAspect()
     ax.xzoomlock = true
     ax.yzoomlock = true
@@ -143,16 +143,26 @@ function imageaxis(f; kwargs...)
 end
 
 
-imageaxis(f::AbstractPlotting.FigurePosition; kwargs...) = imageaxis(f.fig; kwargs...)
+imageaxis(f::Makie.FigurePosition; kwargs...) = imageaxis(f.fig; kwargs...)
 
 # ## Plot recipes
 
 
 @recipe(PlotImage, image) do scene
-    Attributes()
+    Attributes(;
+    #=
+        default_theme(scene)...,
+        colormap = [:black, :white],
+        colorrange = automatic,
+        interpolate = true,
+        fxaa = false,
+        lowclip = nothing,
+        highclip = nothing,
+    =#
+    )
 end
 
-function AbstractPlotting.plot!(plot::PlotImage)
+function Makie.plot!(plot::PlotImage)
     im = plot[:image]
     rim = @lift copy(rotr90($im))
     image!(plot, rim; plot.attributes...)
@@ -164,7 +174,7 @@ end
     Attributes()
 end
 
-function AbstractPlotting.plot!(plot::PlotMask; kwargs...)
+function Makie.plot!(plot::PlotMask; kwargs...)
     mask = plot[:mask]
     classes = try
         classes = plot[:classes]

src/training/lrfind.jl

@@ -92,7 +92,7 @@ function plotlrfind(lrs, losses)
     ax.yticklabelsize = 10.
 
 
-    AbstractPlotting.lines!(ax, log.(lrs), log.(losses), axis = (xticks = LinearTicks(10),))
+    Makie.lines!(ax, log.(lrs), log.(losses), axis = (xticks = LinearTicks(10),))
     return f
 end