Merge pull request #536 from JuliaHealth/fix-motion-bugs

Fix motion bugs and add `colorscale` keyword in `plot_image`
JuliaHealth · Feb 1, 2025 · ccb71b6 · ccb71b6
2 parents 64efca0 + adce005
commit ccb71b6
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/KomaMRIBase/src/motion/Action.jl b/KomaMRIBase/src/motion/Action.jl
@@ -1,7 +1,7 @@
 abstract type AbstractAction{T<:Real} end
 
 Base.:(≈)(a1::AbstractAction, a2::AbstractAction) = (typeof(a1) == typeof(a2)) & reduce(&, [getfield(a1, field)  ≈ getfield(a2, field) for field in fieldnames(typeof(a1))])
-is_composable(m::AbstractAction) = false
+is_composable(m::AbstractAction) = true
 
 # Simple actions
 include("actions/SimpleAction.jl")

diff --git a/KomaMRIBase/src/motion/TimeCurve.jl b/KomaMRIBase/src/motion/TimeCurve.jl
@@ -107,7 +107,7 @@ julia> periodic = Periodic(period=1.0, asymmetry=0.2)
 ```
 ![Periodic](../assets/periodic.svg)
 """
-Periodic(period::T, asymmetry::T) where T = TimeCurve(t=[zero(T), period*asymmetry, period], t_unit=[zero(T), oneunit(T), zero(T)])
+Periodic(period::T, asymmetry::T) where T = TimeCurve(t=[zero(T), period*asymmetry, period], t_unit=[zero(T), oneunit(T), zero(T)], periodic=true)
 Periodic(; period=1.0, asymmetry=0.5)     = Periodic(period, asymmetry)
 
 """ Compare two TimeCurves """

diff --git a/KomaMRIBase/src/motion/actions/simpleactions/HeartBeat.jl b/KomaMRIBase/src/motion/actions/simpleactions/HeartBeat.jl
@@ -23,8 +23,6 @@ julia> heartbeat = HeartBeat(circumferential_strain=-0.3, radial_strain=-0.2, lo
     longitudinal_strain    :: T
 end
 
-is_composable(action::HeartBeat) = true
-
 function displacement_x!(ux, action::HeartBeat, x, y, z, t)
     r = sqrt.(x .^ 2 + y .^ 2)
     θ = atan.(y, x)

diff --git a/KomaMRIBase/src/motion/actions/simpleactions/Rotate.jl b/KomaMRIBase/src/motion/actions/simpleactions/Rotate.jl
@@ -60,8 +60,6 @@ RotateX(pitch::T) where {T<:Real} = Rotate(pitch, zero(T), zero(T))
 RotateY(roll::T) where {T<:Real}  = Rotate(zero(T), roll, zero(T))
 RotateZ(yaw::T) where {T<:Real}   = Rotate(zero(T), zero(T), yaw)
 
-is_composable(action::Rotate) = true
-
 function displacement_x!(ux, action::Rotate, x, y, z, t)   
     # Not using sind and cosd functions until bug with oneAPI is solved: 
     # https://github.com/JuliaGPU/oneAPI.jl/issues/65

diff --git a/KomaMRIBase/src/motion/actions/simpleactions/Translate.jl b/KomaMRIBase/src/motion/actions/simpleactions/Translate.jl
@@ -27,6 +27,8 @@ TranslateX(dx::T) where {T<:Real} = Translate(dx, zero(T), zero(T))
 TranslateY(dy::T) where {T<:Real} = Translate(zero(T), dy, zero(T))
 TranslateZ(dz::T) where {T<:Real} = Translate(zero(T), zero(T), dz)
 
+is_composable(m::Translate) = false
+
 function displacement_x!(ux, action::Translate, x, y, z, t)
     ux .= t.* action.dx
     return nothing

diff --git a/KomaMRIPlots/src/ui/DisplayFunctions.jl b/KomaMRIPlots/src/ui/DisplayFunctions.jl
@@ -796,6 +796,7 @@ function plot_image(
     zmax=maximum(image[:]),
     darkmode=false,
     title="",
+    colorscale="Greys"
 )
     #Layout
     bgcolor, text_color, plot_bgcolor, grid_color, sep_color = theme_chooser(darkmode)
@@ -825,7 +826,7 @@ function plot_image(
         l.width = width
     end
     #Plot
-    p = heatmap(; z=image, transpose=false, zmin=zmin, zmax=zmax, colorscale="Greys")
+    p = heatmap(; z=image, transpose=false, zmin=zmin, zmax=zmax, colorscale=colorscale)
     config = PlotConfig(;
         displaylogo=false,
         toImageButtonOptions=attr(;