Fixed issues causing NAMESPACE issues

davidcsterratt · Jan 5, 2024 · 0116555 · 0116555
1 parent bcf846b
commit 0116555
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/pkg/retistruct/NAMESPACE b/pkg/retistruct/NAMESPACE
@@ -100,9 +100,10 @@ export(sphericalplot)
 export(tri.area)
 export(tri.area.signed)
 export(vecnorm)
-import(rgl)
+import(rgl, except = triangulate)
 import(ttutils)
 importFrom(R6,R6Class)
+importFrom(RTriangle,triangulate)
 importFrom(geometry,Unique)
 importFrom(geometry,bary2cart)
 importFrom(geometry,delaunayn)

diff --git a/pkg/retistruct/R/ReconstructedOutline.R b/pkg/retistruct/R/ReconstructedOutline.R
@@ -1252,7 +1252,6 @@ lvsLplot.ReconstructedOutline <- function(r, ...) {
 ##' @param ... Other graphics parameters -- not used at present
 ##' @method sphericalplot ReconstructedOutline
 ##' @author David Sterratt
-##' @import rgl
 ##' @export
 sphericalplot.ReconstructedOutline <- function(r,
                                                strain=FALSE,

diff --git a/pkg/retistruct/R/TriangulatedFragment.R b/pkg/retistruct/R/TriangulatedFragment.R
@@ -4,7 +4,8 @@
 ##'   triangulated mesh over an fragment, and fields to hold the mesh
 ##'   information.
 ##' @import ttutils
-##' @importFrom geometry Unique 
+##' @importFrom geometry Unique
+##' @importFrom RTriangle triangulate
 ##' @author David Sterratt
 ##' @export
 TriangulatedFragment <- R6Class("TriangulatedFragment",

diff --git a/pkg/retistruct/R/TriangulatedOutline.R b/pkg/retistruct/R/TriangulatedOutline.R
@@ -95,7 +95,7 @@ flatplot.TriangulatedOutline <- function(x, axt="n",
     trimesh(x$T, x$P, col="grey", add=TRUE)
 }
 
-##' @import rgl
+##' @rawNamespace import(rgl, except = triangulate)
 ##' @method depthplot3D TriangulatedOutline
 ##' @export
 depthplot3D.TriangulatedOutline <- function(r, ...) {