Fis issues with colorbar and units -> strip them out of the attribute…

… and colorrange

ext/PlantGeomMakie.jl

@@ -11,6 +11,7 @@ import MultiScaleTreeGraph
 import MultiScaleTreeGraph: get_attributes
 import ColorSchemes: get, rainbow, colorschemes, ColorScheme
 import UUIDs
+import Unitful
 
 MeshesMakieExt = Base.get_extension(Meshes, :MeshesMakieExt)
 

ext/makie_recipes/colorbar.jl

@@ -38,19 +38,20 @@ function PlantGeom.colorbar(parent, plotobject; kwargs...)
 
  # Because we extend the `Viz` type, we need to check if the user has given a color range.
  # If we defined our own e.g. `PlantViz` type, we could have defined a `colorrange` field in it directly.
- if hasproperty(plotobject.attributes, :colorrange)
+
+ if hasproperty(plotobject.attributes, :colorrange) && (!isa(plotobject.attributes.colorrange, Observables.Observable) || plotobject.attributes.colorrange[] !== nothing)
  if isa(plotobject.attributes.colorrange, Observables.Observable)
- colorbar_limits = plotobject.attributes.colorrange
+ # colorbar_limits = Unitful.ustrip.(plotobject.attributes.colorrange[])
+ colorbar_limits = Makie.lift(x -> Unitful.ustrip.(x), plotobject.attributes.colorrange)
  else
  colorbar_limits = Observables.Observable(plotobject.attributes.colorrange)
  end
  else
  # Get the attribute values without nothing values: 
- colorbar_limits = Makie.@lift PlantGeom.attribute_range($mtg, $color)
+ colorbar_limits = Makie.@lift PlantGeom.attribute_range($mtg, $color, ustrip=true)
  end
-
  colormap = Makie.lift(get_colormap, plotobject.attributes.colormap)
- println(colorbar_limits)
+
  Makie.Colorbar(
  parent,
  colormap=colormap,

ext/makie_recipes/opf/plot_opf.jl

@@ -149,7 +149,7 @@ function plot_opf(colorant::Observables.Observable{AttributeColorant}, plot)
  color_range = plot[:colorrange]
  else
  # Get the attribute values without nothing values: 
- color_range = Makie.@lift PlantGeom.attribute_range($opf, $colorant)
+ color_range = Makie.@lift PlantGeom.attribute_range($opf, $colorant, ustrip=true)
  end
 
  if hasproperty(plot, :index)

src/colors/colors.jl

@@ -41,18 +41,20 @@ get_color(1:2, 1:10, colormap = colorschemes[:viridis]) # returns RGB{N0f8}(0.26
 get_color(1:2, 1:10, 1, colormap = colorschemes[:viridis]) # returns RGB{N0f8}(0.267004,0.00487433,0.329415)
 """
 function get_color(var::T, range_var, index::Nothing=nothing; colormap=colorschemes[:viridis]) where {T<:AbstractArray}
+ range_var = Unitful.ustrip.(range_var)
  x2 = (range_var[2] - range_var[1])
  # get the color based on a colormap and the normalized attribute value
- [get(colormap, (i - range_var[1]) / x2) for i in var]
+ [get(colormap, (i - range_var[1]) / x2) for i in Unitful.ustrip.(var)]
 end
 
 function get_color(var::T, range_var, index::I; colormap=colorschemes[:viridis]) where {T<:AbstractArray,I<:Integer}
  get_color(var[index], range_var; colormap=colormap)
 end
 
 function get_color(var, range_var, index::I=1; colormap=colorschemes[:viridis]) where {I<:Integer}
+ range_var = Unitful.ustrip.(range_var)
  # get the color based on a colormap and the normalized attribute value
- get(colormap, (var - range_var[1]) / (range_var[2] - range_var[1]))
+ get(colormap, (Unitful.ustrip(var) - range_var[1]) / (range_var[2] - range_var[1]))
 end
 
 

src/opf/mtg_recipe_helpers.jl

@@ -164,7 +164,7 @@ function mtg_coordinates_df!(mtg, attr=:YY; force=false)
  DataFrame(mtg, unique([:XX, :YY, :ZZ, :XX_from, :YY_from, :ZZ_from, attr]))
 end
 
-function attribute_range(mtg, attr)
+function attribute_range(mtg, attr; ustrip=false)
  attr_name = attr_colorant_name(attr)
  vals =
  MultiScaleTreeGraph.descendants(
@@ -183,6 +183,10 @@ function attribute_range(mtg, attr)
  range_val = (minimum(minimum.(vals_no_nothing)), maximum(maximum.(vals_no_nothing)))
  end
 
+ if ustrip
+ return Unitful.ustrip.(range_val)
+ end
+
  return range_val
 end