handle imports nicer

Author: baggepinnen

lib/ControlSystemsBase/ext/ControlSystemsBaseMakieExt.jl

@@ -151,9 +151,9 @@ function CSMakie.bodeplot!(fig, systems::Union{LTISystem, AbstractVector{<:LTISy
 
                 if adaptive && eltype(magdata) <: AbstractFloat
                     wsi, magi, _ = downsample(ws, magdata, _span(magdata)/500)
-                    lines!(ax_mag, wsi, magi, label=lab)
+                    lines!(ax_mag, wsi, magi; label=lab, kwargs...)
                 else
-                    lines!(ax_mag, ws, magdata, label=lab)
+                    lines!(ax_mag, ws, magdata; label=lab, kwargs...)
                 end
 
                 # Plot phase
@@ -173,9 +173,9 @@ function CSMakie.bodeplot!(fig, systems::Union{LTISystem, AbstractVector{<:LTISy
                     if adaptive && eltype(phasedata) <: AbstractFloat
                         wsp, phasep, _ = downsample(ws, phasedata, 
                                                    _span(phasedata)/500)
-                        lines!(ax_phase, wsp, phasep)
+                        lines!(ax_phase, wsp, phasep; kwargs...)
                     else
-                        lines!(ax_phase, ws, phasedata)
+                        lines!(ax_phase, ws, phasedata; kwargs...)
                     end
                 end
             end

lib/ControlSystemsBase/test/test_makie_plots.jl

@@ -1,7 +1,8 @@
 using ControlSystemsBase
 using Test
 using LinearAlgebra
-using CairoMakie
+import CairoMakie
+import CairoMakie.Makie
 
 @testset "Makie Plot Tests" begin
     # Create test systems
@@ -126,13 +127,13 @@ using CairoMakie
         t = 0:0.01:5
         res = step(P, t)
         @test_nowarn begin
-            fig = plot(res)
-            plot!(fig[1,2], res)
+            fig = Makie.plot(res)
+            Makie.plot!(fig[1,2], res)
             @test fig isa Makie.Figure
         end
         @test_nowarn begin
-            fig = plot(res; plotu=true, plotx=true)
-            plot!(fig[1,2], res, plotu=true, plotx=true)
+            fig = Makie.plot(res; plotu=true, plotx=true)
+            Makie.plot!(fig[1,2], res, plotu=true, plotx=true)
             @test fig isa Makie.Figure
         end
     end
@@ -141,8 +142,8 @@ using CairoMakie
         res = step(P, 100)
         si = stepinfo(res)
         @test_nowarn begin
-            fig = plot(si)
-            plot!(fig[1,2], si)
+            fig = Makie.plot(si)
+            Makie.plot!(fig[1,2], si)
             @test fig isa Makie.Figure
         end
     end