Fix MakieExt and ControlPlotsExt define VortexStepMethod.plot_geometry for the same type

Fixes #236

Author: ufechner7

ext/VortexStepMethodControlPlotsExt.jl

@@ -6,6 +6,11 @@ import VortexStepMethod: calculate_filaments_for_plotting
 export plot_wing, plot_circulation_distribution, plot_geometry, plot_distribution,
        plot_polars, save_plot, show_plot, plot_polar_data, plot_combined_analysis
 
+# Set this extension as the active plotting backend when loaded
+function __init__()
+    VortexStepMethod._PLOT_BACKEND[] = VortexStepMethod.ControlPlotsBackend()
+end
+
 """
     set_plot_style(titel_size=16; use_tex=false)
 
@@ -284,7 +289,8 @@ Plot wing geometry from different viewpoints and optionally save/show plots.
 - `use_tex`: if the external `pdflatex` command shall be used (default: false)
 
 """
-function VortexStepMethod.plot_geometry(body_aero::BodyAerodynamics, title;
+function VortexStepMethod.plot_geometry(body_aero::BodyAerodynamics, title,
+    ::VortexStepMethod.ControlPlotsBackend;
     data_type=".pdf",
     save_path=nothing,
     is_save=false,
@@ -342,7 +348,8 @@ Plot spanwise distributions of aerodynamic properties.
 - `is_show`: Whether to display plots (default: true)
 - `use_tex`: if the external `pdflatex` command shall be used
 """
-function VortexStepMethod.plot_distribution(y_coordinates_list, results_list, label_list;
+function VortexStepMethod.plot_distribution(y_coordinates_list, results_list, label_list,
+    ::VortexStepMethod.ControlPlotsBackend;
     title="spanwise_distribution",
     data_type=".pdf",
     save_path=nothing,
@@ -547,7 +554,8 @@ Plot polar data comparing different solvers and configurations.
 function VortexStepMethod.plot_polars(
     solver_list,
     body_aero_list,
-    label_list;
+    label_list,
+    ::VortexStepMethod.ControlPlotsBackend;
     literature_path_list=String[],
     angle_range=range(0, 20, 2),
     angle_type="angle_of_attack",
@@ -755,7 +763,8 @@ relative to the 2d airfoil or panel chord line.
 - `is_show`: Whether to display plots (default: true)
 - `use_tex`: if the external `pdflatex` command shall be used
 """
-function VortexStepMethod.plot_polar_data(body_aero::BodyAerodynamics;
+function VortexStepMethod.plot_polar_data(body_aero::BodyAerodynamics,
+        ::VortexStepMethod.ControlPlotsBackend;
         alphas=collect(deg2rad.(-5:0.3:25)),
         delta_tes = collect(deg2rad.(-5:0.3:25)),
         is_show = true,
@@ -827,7 +836,8 @@ See individual functions for detailed parameter descriptions.
 function VortexStepMethod.plot_combined_analysis(
     solver,
     body_aero,
-    results;
+    results,
+    ::VortexStepMethod.ControlPlotsBackend;
     solver_label="VSM",
     labels=nothing,
     angle_range=range(0, 20, length=20),

ext/VortexStepMethodMakieExt.jl

@@ -5,6 +5,11 @@ import VortexStepMethod: calculate_filaments_for_plotting
 export plot_geometry, plot_distribution, plot_polars, save_plot, show_plot,
     plot_polar_data, plot_combined_analysis
 
+# Set this extension as the active plotting backend when loaded
+function __init__()
+    VortexStepMethod._PLOT_BACKEND[] = VortexStepMethod.MakieBackend()
+end
+
 # Global storage for panel mesh observables (for dynamic plotting)
 const PANEL_MESH_OBSERVABLES = Ref{Union{Nothing,Dict}}(nothing)
 
@@ -479,7 +484,8 @@ Plot wing geometry from different viewpoints using Makie.
 - `view_azimuth`: View azimuth angle in degrees (default: -120)
 - `use_tex`: Ignored for Makie (default: false)
 """
-function VortexStepMethod.plot_geometry(body_aero::BodyAerodynamics, title;
+function VortexStepMethod.plot_geometry(body_aero::BodyAerodynamics, title,
+    ::VortexStepMethod.MakieBackend;
     data_type=nothing,
     save_path=nothing,
     is_save=false,
@@ -535,7 +541,8 @@ Plot spanwise distributions of aerodynamic properties using Makie.
 - `is_show`: Whether to display (default: true)
 - `use_tex`: Ignored for Makie (default: false)
 """
-function VortexStepMethod.plot_distribution(y_coordinates_list, results_list, label_list;
+function VortexStepMethod.plot_distribution(y_coordinates_list, results_list, label_list,
+    ::VortexStepMethod.MakieBackend;
     title="spanwise_distribution",
     data_type=nothing,
     save_path=nothing,
@@ -700,7 +707,8 @@ Plot polar data comparing different solvers using Makie.
 function VortexStepMethod.plot_polars(
     solver_list,
     body_aero_list,
-    label_list;
+    label_list,
+    ::VortexStepMethod.MakieBackend;
     literature_path_list=String[],
     angle_range=range(0, 20, 2),
     angle_type="angle_of_attack",
@@ -882,7 +890,8 @@ Plot polar data (Cl, Cd, Cm) as 3D surfaces using Makie.
 - `is_show`: Whether to display (default: true)
 - `use_tex`: Ignored for Makie (default: false)
 """
-function VortexStepMethod.plot_polar_data(body_aero::BodyAerodynamics;
+function VortexStepMethod.plot_polar_data(body_aero::BodyAerodynamics,
+    ::VortexStepMethod.MakieBackend;
     alphas=collect(deg2rad.(-5:0.3:25)),
     delta_tes=collect(deg2rad.(-5:0.3:25)),
     is_show=true,
@@ -972,7 +981,8 @@ Create combined multi-panel figure with geometry, polar data, distributions, and
 function VortexStepMethod.plot_combined_analysis(
     solver,
     body_aero,
-    results;
+    results,
+    ::VortexStepMethod.MakieBackend;
     solver_label="VSM",
     labels=nothing,
     angle_range=range(0, 20, length=20),

src/VortexStepMethod.jl

@@ -46,7 +46,32 @@ export load_polar_data
 export plot_circulation_distribution, plot_combined_analysis, plot_distribution, plot_geometry,
     plot_polar_data, plot_polars, save_plot, show_plot
 
-# the following functions are defined in ext/VortexStepMethodExt.jl
+# Backend dispatch types for multi-backend support (Makie and ControlPlots can coexist)
+abstract type PlotBackend end
+struct MakieBackend <: PlotBackend end
+struct ControlPlotsBackend <: PlotBackend end
+export PlotBackend, MakieBackend, ControlPlotsBackend
+
+const _PLOT_BACKEND = Ref{Union{Nothing, PlotBackend}}(nothing)
+
+"""
+    set_plot_backend!(backend::PlotBackend)
+
+Select the active plotting backend when both Makie and ControlPlots are loaded.
+
+# Example
+```julia
+set_plot_backend!(MakieBackend())
+set_plot_backend!(ControlPlotsBackend())
+```
+"""
+function set_plot_backend!(backend::PlotBackend)
+    _PLOT_BACKEND[] = backend
+end
+export set_plot_backend!
+
+# Generic stubs — extended by MakieExt and ControlPlotsExt with a PlotBackend argument.
+# The no-backend-argument wrappers below route through the active backend.
 function plot_geometry end
 function plot_distribution end
 function plot_circulation_distribution end
@@ -56,6 +81,36 @@ function show_plot end
 function plot_polar_data end
 function plot_combined_analysis end
 
+function _active_backend()
+    b = _PLOT_BACKEND[]
+    isnothing(b) && error(
+        "No plotting backend loaded. Load Makie or ControlPlots first, " *
+        "or call set_plot_backend!(MakieBackend()) / set_plot_backend!(ControlPlotsBackend()) " *
+        "when both are loaded."
+    )
+    b
+end
+
+function plot_geometry(body_aero, title; kwargs...)
+    plot_geometry(body_aero, title, _active_backend(); kwargs...)
+end
+
+function plot_distribution(y_coordinates_list, results_list, label_list; kwargs...)
+    plot_distribution(y_coordinates_list, results_list, label_list, _active_backend(); kwargs...)
+end
+
+function plot_polars(solver_list, body_aero_list, label_list; kwargs...)
+    plot_polars(solver_list, body_aero_list, label_list, _active_backend(); kwargs...)
+end
+
+function plot_polar_data(body_aero; kwargs...)
+    plot_polar_data(body_aero, _active_backend(); kwargs...)
+end
+
+function plot_combined_analysis(solver, body_aero, results; kwargs...)
+    plot_combined_analysis(solver, body_aero, results, _active_backend(); kwargs...)
+end
+
 """
    const MVec3    = MVector{3, Float64}