diff --git a/ext/CaesarImagesExt.jl b/ext/CaesarImagesExt.jl index 65c134131..839830e78 100644 --- a/ext/CaesarImagesExt.jl +++ b/ext/CaesarImagesExt.jl @@ -1,8 +1,5 @@ module CaesarImagesExt -@info "Loading Caesar tools related to Images.jl." - - using Images # using ImageTransformations using ColorVectorSpace @@ -28,7 +25,7 @@ import GeometricalPredicates as GeoPr import ApproxManifoldProducts: sample, _update! import IncrementalInference: getSample, preambleCache, _update!, getManifold -import Caesar: applyMaskImage, makeMaskImage, makeMaskImages, imhcatPretty, toImage +import Caesar: applyMaskImage, makeMaskImage, makeMaskImages, imhcatPretty import Caesar: writevideo, csmAnimationJoinImgs, csmAnimateSideBySide, makeVideoFromData import Caesar: overlayScanMatcher import Caesar: overlayScatter, overlayScatterMutate @@ -46,7 +43,7 @@ import Caesar: unionFeatureMountain, sortKeysMinSighting # NOTE usage requires ImageFeatures.jl import Caesar: curateFeatureTracks -include("Images/ROSImageConversion.jl") + include("Images/ImageMask.jl") include("Images/ImageToVideoUtils.jl") include("Images/ScanMatcherUtils.jl") diff --git a/src/Caesar.jl b/src/Caesar.jl index d756609a2..5949a51a8 100644 --- a/src/Caesar.jl +++ b/src/Caesar.jl @@ -80,6 +80,8 @@ include("beamforming/MatchedFilter.jl") include("beamforming/SASBearing2D.jl") include("beamforming/SASUtils.jl") +include("services/ToImage.jl") + include("3rdParty/_PCL/_PCL.jl") # object affordance work diff --git a/src/ExportAPI.jl b/src/ExportAPI.jl index cfe9610e0..16ea95ed2 100644 --- a/src/ExportAPI.jl +++ b/src/ExportAPI.jl @@ -53,4 +53,6 @@ export packBlob, unpackBlob # imagedraw.jl export makeImage! -export drawKeypointsAndMask \ No newline at end of file +export drawKeypointsAndMask + +export toImage \ No newline at end of file diff --git a/ext/Images/ROSImageConversion.jl b/src/services/ToImage.jl similarity index 94% rename from ext/Images/ROSImageConversion.jl rename to src/services/ToImage.jl index a021d4f0a..c2aeb7717 100644 --- a/ext/Images/ROSImageConversion.jl +++ b/src/services/ToImage.jl @@ -3,7 +3,7 @@ """ $SIGNATURES -Also see: [`toROSImage`](@ref) +Also see: [`PyCaesar.toROSImage`](@ref) """ function toImage(msgd::Dict{String,Any}) data = haskey(msgd, "data_b64") ? base64decode(msgd["data_b64"]) : UInt8.(msgd["data"]) @@ -24,4 +24,4 @@ function toImage(msgd::Dict{String,Any}) else error("Conversion for ROS sensor_msgs.Image encoding not implemented yet $(msgd["encoding"])") end -end +end \ No newline at end of file