rework modules

Author: t-bltg

PlotsBase/src/Annotations.jl

@@ -1,69 +1,65 @@
 module Arrows
 
-    export Arrow, arrow, add_arrows
+export Arrow, arrow, add_arrows
 
-    using ..PlotsBase.Commons
+using ..PlotsBase.Commons
 
-    # style is :open or :closed (for now)
-    struct Arrow
-        style::Symbol
-        side::Symbol  # :head (default), :tail, or :both
-        headlength::Float64
-        headwidth::Float64
-    end
+# style is :open or :closed (for now)
+struct Arrow
+    style::Symbol
+    side::Symbol  # :head (default), :tail, or :both
+    headlength::Float64
+    headwidth::Float64
+end
 
-    """
-        arrow(args...)
+"""
+    arrow(args...)
 
-    Define arrowheads to apply to lines - args are `style` (`:open` or `:closed`),
-    `side` (`:head`, `:tail` or `:both`), `headlength` and `headwidth`
-    """
-    function arrow(args...)
-        style, side = :simple, :head
-        headlength = headwidth = 1
-        setlength = false
-        for arg in args
-            T = typeof(arg)
-            if T == Symbol
-                if arg in (:head, :tail, :both)
-                    side = arg
-                else
-                    style = arg
-                end
-            elseif T <: Number
-                # first we apply to both, but if there's more, then only change width after the first number
-                headwidth = Float64(arg)
-                if !setlength
-                    headlength = headwidth
-                end
-                setlength = true
-            elseif T <: Tuple && length(arg) == 2
-                headlength, headwidth = Float64(arg[1]), Float64(arg[2])
+Define arrowheads to apply to lines - args are `style` (`:open` or `:closed`),
+`side` (`:head`, `:tail` or `:both`), `headlength` and `headwidth`
+"""
+function arrow(args...)
+    style, side = :simple, :head
+    headlength = headwidth = 1
+    setlength = false
+    for arg in args
+        T = typeof(arg)
+        if T == Symbol
+            if arg in (:head, :tail, :both)
+                side = arg
             else
-                @warn "Skipped arrow arg $arg"
+                style = arg
+            end
+        elseif T <: Number
+            # first we apply to both, but if there's more, then only change width after the first number
+            headwidth = Float64(arg)
+            if !setlength
+                headlength = headwidth
             end
+            setlength = true
+        elseif T <: Tuple && length(arg) == 2
+            headlength, headwidth = Float64(arg[1]), Float64(arg[2])
+        else
+            @warn "Skipped arrow arg $arg"
         end
-        return Arrow(style, side, headlength, headwidth)
     end
+    return Arrow(style, side, headlength, headwidth)
+end
 
-    # allow for do-block notation which gets called on every valid start/end pair which
-    # we need to draw an arrow
-    function add_arrows(func::Function, x::AVec, y::AVec)
-        for i in 2:length(x)
-            xyprev = (x[i - 1], y[i - 1])
-            xy = (x[i], y[i])
-            if ok(xyprev) && ok(xy)
-                if i == length(x) || !ok(x[i + 1], y[i + 1])
-                    # add the arrow from xyprev to xy
-                    func(xyprev, xy)
-                end
+# allow for do-block notation which gets called on every valid start/end pair which
+# we need to draw an arrow
+function add_arrows(func::Function, x::AVec, y::AVec)
+    for i in 2:length(x)
+        xyprev = (x[i - 1], y[i - 1])
+        xy = (x[i], y[i])
+        if ok(xyprev) && ok(xy)
+            if i == length(x) || !ok(x[i + 1], y[i + 1])
+                # add the arrow from xyprev to xy
+                func(xyprev, xy)
             end
         end
-        return
     end
+    return
+end
 
 end  # module
-
-# -----------------------------------------------------------------------------
-
-using .Arrows

PlotsBase/src/Arrows.jl

@@ -4,7 +4,7 @@ module Axes
     export sort_3d_axes, axes_letters, process_axis_arg!, has_ticks, get_axis, get_guide
 
     import ..PlotsBase
-    import ..PlotsBase: Subplot, DefaultsDict, attr!
+    import ..PlotsBase: Subplot, DefaultsDict
 
     using ..RecipesPipeline
     using ..Commons
@@ -56,7 +56,7 @@ module Axes
         attr = DefaultsDict(explicit, Commons._axis_defaults_byletter[letter])
 
         # update the defaults
-        return attr!(Axis([sp], attr), args...; kw...)
+        return PlotsBase.attr!(Axis([sp], attr), args...; kw...)
     end
 
     "properly retrieve from axis.attr, passing `:match` to the correct key"

PlotsBase/src/Axes.jl

@@ -1,26 +1,22 @@
 module BezierCurves
 
-    import ..PlotsBase
+import ..PlotsBase
 
-    "create a BezierCurve for plotting"
-    mutable struct BezierCurve{T <: Tuple}
-        control_points::Vector{T}
-    end
+"create a BezierCurve for plotting"
+mutable struct BezierCurve{T <: Tuple}
+    control_points::Vector{T}
+end
 
-    function (bc::BezierCurve)(t::Real)
-        p = (0.0, 0.0)
-        n = length(bc.control_points) - 1
-        for i in 0:n
-            p = p .+ bc.control_points[i + 1] .* binomial(n, i) .* (1 - t)^(n - i) .* t^i
-        end
-        return p
+function (bc::BezierCurve)(t::Real)
+    p = (0.0, 0.0)
+    n = length(bc.control_points) - 1
+    for i in 0:n
+        p = p .+ bc.control_points[i + 1] .* binomial(n, i) .* (1 - t)^(n - i) .* t^i
     end
+    return p
+end
 
-    PlotsBase.coords(curve::BezierCurve, n::Integer = 30; range = [0, 1]) =
-        map(curve, Base.range(first(range), stop = last(range), length = n))
+PlotsBase.coords(curve::BezierCurve, n::Integer = 30; range = [0, 1]) =
+    map(curve, Base.range(first(range), stop = last(range), length = n))
 
 end  # module
-
-# -----------------------------------------------------------------------------
-
-using .BezierCurves