Align with qutip

Author: albertomercurio

ext/QuantumToolboxMakieExt.jl

@@ -34,6 +34,8 @@ import Makie:
     update_cam!,
     cam3d!
 
+import Makie.GeometryBasics: Tessellation
+
 @doc raw"""
     plot_wigner(
         library::Val{:Makie},
@@ -349,8 +351,8 @@ Render the Bloch sphere visualization from the given [`Bloch`](@ref) object `b`.
 function QuantumToolbox.render(b::Bloch; location = nothing)
     fig, lscene = _setup_bloch_plot!(b, location)
     _draw_bloch_sphere!(b, lscene)
-    _draw_reference_circles!(lscene)
-    _draw_axes!(lscene)
+    _draw_reference_circles!(b, lscene)
+    _draw_axes!(b, lscene)
     _plot_points!(b, lscene)
     _plot_lines!(b, lscene)
     _plot_arcs!(b, lscene)
@@ -376,9 +378,7 @@ Sets up the `3D` coordinate system with appropriate limits and view angles.
 """
 function _setup_bloch_plot!(b::Bloch, location)
     fig, location = _getFigAndLocation(location)
-    bg_color = parse(RGBf, b.frame_color)
-    frame_color = RGBAf(bg_color, b.frame_alpha)
-    lscene = LScene(location, show_axis = false, scenekw = (backgroundcolor = frame_color,))
+    lscene = LScene(location, show_axis = false, scenekw = (clear = true,))
     length(b.view) == 2 || throw(ArgumentError("The length of `Bloch.view` must be 2."))
     cam3d!(lscene.scene, center = false)
     cam = cameracontrols(lscene)
@@ -393,65 +393,52 @@ raw"""
 Draw the translucent sphere representing the Bloch sphere surface.
 """
 function _draw_bloch_sphere!(b::Bloch, lscene)
-    n_lon = 4
-    n_lat = 4
     radius = 1.0f0
-    base_color = parse(RGBf, b.sphere_color)
-    sphere_color = RGBAf(base_color, b.sphere_alpha)
     sphere_mesh = Sphere(Point3f(0), radius)
-    mesh!(lscene, sphere_mesh; color = sphere_color, shading = NoShading, transparency = true, rasterize = 3)
-    θ_vals = range(0.0f0, 2π, length = n_lon + 1)[1:(end-1)]
-    φ_curve = range(0.0f0, π, length = 600)
-    line_alpha = max(0.05, b.sphere_alpha * 0.5)
+    mesh!(
+        lscene,
+        sphere_mesh;
+        color = b.sphere_color,
+        alpha = b.sphere_alpha,
+        shading = NoShading,
+        transparency = true,
+        rasterize = 3,
+    )
+    θ_vals = range(0, π, 5)[1:(end-1)]
+    φ_curve = range(0, 2π, 600)
     for θi in θ_vals
-        x_line = [radius * sin(ϕ) * cos(θi) for ϕ in φ_curve]
-        y_line = [radius * sin(ϕ) * sin(θi) for ϕ in φ_curve]
-        z_line = [radius * cos(ϕ) for ϕ in φ_curve]
-        lines!(
-            lscene,
-            x_line,
-            y_line,
-            z_line;
-            color = RGBAf(0.5, 0.5, 0.5, line_alpha),
-            linewidth = 1,
-            transparency = true,
-        )
+        x_line = radius * sin.(φ_curve) .* cos(θi)
+        y_line = radius * sin.(φ_curve) .* sin(θi)
+        z_line = radius * cos.(φ_curve)
+        lines!(lscene, x_line, y_line, z_line; color = b.frame_color, alpha = b.frame_alpha)
     end
-    φ_vals = range(0.0f0, π, length = n_lat + 2)
-    θ_curve = range(0.0f0, 2π, length = 600)
+    φ_vals = range(0, π, 6)
+    θ_curve = range(0, 2π, 600)
     for ϕ in φ_vals
-        x_ring = [radius * sin(ϕ) * cos(θi) for θi in θ_curve]
-        y_ring = [radius * sin(ϕ) * sin(θi) for θi in θ_curve]
+        x_ring = radius * sin(ϕ) .* cos.(θ_curve)
+        y_ring = radius * sin(ϕ) .* sin.(θ_curve)
         z_ring = fill(radius * cos(ϕ), length(θ_curve))
-        lines!(
-            lscene,
-            x_ring,
-            y_ring,
-            z_ring;
-            color = RGBAf(0.5, 0.5, 0.5, line_alpha),
-            linewidth = 1,
-            transparency = true,
-        )
+        lines!(lscene, x_ring, y_ring, z_ring; color = b.frame_color, alpha = b.frame_alpha)
     end
 end
 
 raw"""
-    _draw_reference_circles!(lscene)
+    _draw_reference_circles!(b::Bloch, lscene)
 
-Draw the three great circles `(XY, YZ, XZ planes)` on the Bloch sphere.
+Draw the three great circles `(XY, XZ planes)` on the Bloch sphere.
 
 # Arguments
+- `b::Bloch`: Bloch sphere object containing frame color
 - `lscene`: Makie LScene object for drawing
 
 Adds faint circular guidelines representing the three principal planes.
 """
-function _draw_reference_circles!(lscene)
-    wire_color = RGBAf(0.5, 0.5, 0.5, 0.4)
+function _draw_reference_circles!(b::Bloch, lscene)
+    wire_color = b.frame_color
     φ = range(0, 2π, length = 100)
-    # XY, YZ, XZ circles
+    # XY, XZ circles
     circles = [
         [Point3f(cos(φi), sin(φi), 0) for φi in φ],  # XY
-        [Point3f(0, cos(φi), sin(φi)) for φi in φ],  # YZ
         [Point3f(cos(φi), 0, sin(φi)) for φi in φ],  # XZ
     ]
     for circle in circles
@@ -460,25 +447,25 @@ function _draw_reference_circles!(lscene)
 end
 
 raw"""
-    _draw_axes!(lscene)
+    _draw_axes!(b::Bloch, lscene)
 
 Draw the three principal axes `(x, y, z)` of the Bloch sphere.
 
 # Arguments
+- `b::Bloch`: Bloch sphere object containing axis color
 - `lscene`: Makie LScene object for drawing
 
 Creates visible axis lines extending slightly beyond the unit sphere.
 """
-function _draw_axes!(lscene)
-    axis_color = RGBAf(0.3, 0.3, 0.3, 0.8)
-    axis_width = 0.8
+function _draw_axes!(b::Bloch, lscene)
+    axis_color = b.frame_color
     axes = [
-        ([Point3f(1.0, 0, 0), Point3f(-1.0, 0, 0)], "x"),  # X-axis
-        ([Point3f(0, 1.0, 0), Point3f(0, -1.0, 0)], "y"),  # Y-axis
-        ([Point3f(0, 0, 1.0), Point3f(0, 0, -1.0)], "z"),  # Z-axis
+        [Point3f(1.0, 0, 0), Point3f(-1.0, 0, 0)],  # X-axis
+        [Point3f(0, 1.0, 0), Point3f(0, -1.0, 0)],  # Y-axis
+        [Point3f(0, 0, 1.0), Point3f(0, 0, -1.0)],  # Z-axis
     ]
-    for (points, _) in axes
-        lines!(lscene, points; color = axis_color, linewidth = axis_width)
+    for points in axes
+        lines!(lscene, points; color = axis_color)
     end
 end
 
@@ -667,52 +654,51 @@ function _add_labels!(b::Bloch, lscene)
 
     label_color = parse(RGBf, b.font_color)
     label_size = b.font_size
-    offset_scale = b.frame_limit
 
     (b.xlabel[1] == "") || text!(
         lscene,
         b.xlabel[1],
-        position = Point3f(offset_scale * b.xlpos[1], 0, 0),
+        position = Point3f(b.xlpos[1], 0, 0),
         color = label_color,
         fontsize = label_size,
         align = (:center, :center),
     )
     (b.xlabel[2] == "") || text!(
         lscene,
         b.xlabel[2],
-        position = Point3f(offset_scale * b.xlpos[2], 0, 0),
+        position = Point3f(b.xlpos[2], 0, 0),
         color = label_color,
         fontsize = label_size,
         align = (:center, :center),
     )
     (b.ylabel[1] == "") || text!(
         lscene,
         b.ylabel[1],
-        position = Point3f(0, offset_scale * b.ylpos[1], 0),
+        position = Point3f(0, b.ylpos[1], 0),
         color = label_color,
         fontsize = label_size,
         align = (:center, :center),
     )
     (b.ylabel[2] == "") || text!(
         lscene,
         b.ylabel[2],
-        position = Point3f(0, offset_scale * b.ylpos[2], 0),
+        position = Point3f(0, b.ylpos[2], 0),
         color = label_color,
         fontsize = label_size,
         align = (:center, :center),
     )
     (b.zlabel[1] == "") || text!(
         lscene,
         b.zlabel[1],
-        position = Point3f(0, 0, offset_scale * b.zlpos[1]),
+        position = Point3f(0, 0, b.zlpos[1]),
         color = label_color,
         fontsize = label_size,
         align = (:center, :center),
     )
     (b.zlabel[2] == "") || text!(
         lscene,
         b.zlabel[2],
-        position = Point3f(0, 0, offset_scale * b.zlpos[2]),
+        position = Point3f(0, 0, b.zlpos[2]),
         color = label_color,
         fontsize = label_size,
         align = (:center, :center),

src/visualization.jl

@@ -81,9 +81,8 @@ A structure representing a Bloch sphere visualization for quantum states.
 
 - `font_color::String`: Color of axis labels and text
 - `font_size::Int`: Font size for labels. Default: `15`
-- `frame_alpha::Float64`: Transparency of the frame background
-- `frame_color::String`: Background color of the frame
-- `frame_limit::Float64`: Axis limits for the 3D frame (symmetric around origin)
+- `frame_alpha::Float64`: Transparency of the wireframe
+- `frame_color::String`: Color of the wireframe
 
 ## Point properties
 
@@ -111,11 +110,11 @@ A structure representing a Bloch sphere visualization for quantum states.
 
 ## Label properties
 - `xlabel::Vector{AbstractString}`: Labels for x-axis. Default: `[L"x", ""]`
-- `xlpos::Vector{Float64}`: Positions of x-axis labels. Default: `[1.0, -1.0]`
+- `xlpos::Vector{Float64}`: Positions of x-axis labels. Default: `[1.2, -1.2]`
 - `ylabel::Vector{AbstractString}`: Labels for y-axis. Default: `[L"y", ""]`
-- `ylpos::Vector{Float64}`: Positions of y-axis labels. Default: `[1.0, -1.0]`
+- `ylpos::Vector{Float64}`: Positions of y-axis labels. Default: `[1.2, -1.2]`
 - `zlabel::Vector{AbstractString}`: Labels for z-axis. Default: `[L"|0\rangle", L"|1\rangle"]`
-- `zlpos::Vector{Float64}`: Positions of z-axis labels. Default: `[1.0, -1.0]`
+- `zlpos::Vector{Float64}`: Positions of z-axis labels. Default: `[1.2, -1.2]`
 """
 @kwdef mutable struct Bloch
     points::Vector{Matrix{Float64}} = Vector{Matrix{Float64}}()
@@ -126,7 +125,6 @@ A structure representing a Bloch sphere visualization for quantum states.
     font_size::Int = 15
     frame_alpha::Float64 = 0.1
     frame_color::String = "gray"
-    frame_limit::Float64 = 1.2
     point_default_color::Vector{String} = ["blue", "red", "green", "#CC6600"]
     point_color::Vector{Union{Nothing,String}} = Union{Nothing,String}[]
     point_marker::Vector{Symbol} = [:circle, :rect, :diamond, :utriangle]
@@ -140,11 +138,11 @@ A structure representing a Bloch sphere visualization for quantum states.
     vector_arrowsize::Vector{Float64} = [0.07, 0.08, 0.08]
     view::Vector{Int} = [30, 30]
     xlabel::Vector{AbstractString} = [L"x", ""]
-    xlpos::Vector{Float64} = [1.0, -1.0]
+    xlpos::Vector{Float64} = [1.2, -1.2]
     ylabel::Vector{AbstractString} = [L"y", ""]
-    ylpos::Vector{Float64} = [1.0, -1.0]
+    ylpos::Vector{Float64} = [1.2, -1.2]
     zlabel::Vector{AbstractString} = [L"|0\rangle", L"|1\rangle"]
-    zlpos::Vector{Float64} = [1.0, -1.0]
+    zlpos::Vector{Float64} = [1.2, -1.2]
 end
 
 const BLOCH_DATA_FIELDS = (:points, :vectors, :lines, :arcs)