Skip to content

Commit afaa349

Browse files
committed
FIX: fix more missing package specification in function links in docstrings
1 parent 571147d commit afaa349

38 files changed

+94
-94
lines changed

R/brainview_magick.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,11 +307,11 @@ images.annotate <- function(images, annotations, do_extend = TRUE, background =
307307
#'
308308
#' @param view_angles list of strings. See \code{\link{get.view.angle.names}} for all valid strings.
309309
#'
310-
#' @param rgloptions option list passed to \code{\link{par3d}}. Example: \code{rgloptions = list("windowRect"=c(50,50,1000,1000))}.
310+
#' @param rgloptions option list passed to \code{\link[rgl]{par3d}}. Example: \code{rgloptions = list("windowRect"=c(50,50,1000,1000))}.
311311
#'
312312
#' @param rglactions named list. A list in which the names are from a set of pre-defined actions. The values can be used to specify parameters for the action.
313313
#'
314-
#' @param style character string, a rendering style, e.g., 'default', 'shiny' or 'semitransparent'. Alternatively, a named list of style parameters (see \code{\link{material3d}}), e.g., \code{list("shininess"=50, specular="black", alpha=0.5)}. Use the magic word 'from_mesh' to use the 'style' field of each coloredmesh instead of a single, global style. In that case, you will have to make sure your meshes have such a field, if not, the style 'default' is used as a fallback for those which don't.
314+
#' @param style character string, a rendering style, e.g., 'default', 'shiny' or 'semitransparent'. Alternatively, a named list of style parameters (see \code{\link[rgl]{material3d}}), e.g., \code{list("shininess"=50, specular="black", alpha=0.5)}. Use the magic word 'from_mesh' to use the 'style' field of each coloredmesh instead of a single, global style. In that case, you will have to make sure your meshes have such a field, if not, the style 'default' is used as a fallback for those which don't.
315315
#'
316316
#' @param output_img string, path to the output file. Defaults to "fsbrain_arranged.png"
317317
#'

R/cbar.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#' @title Draw colorbar into background of current plot.
44
#'
5-
#' @description Requires a rgl 3d visualisation to be open that already contains a rendered object. Uses \code{\link{bgplot3d}} to add a colorbar in the background of the plot using \code{\link[fields]{image.plot}}. Experimental.
5+
#' @description Requires a rgl 3d visualisation to be open that already contains a rendered object. Uses \code{\link[rgl]{bgplot3d}} to add a colorbar in the background of the plot using \code{\link[fields]{image.plot}}. Experimental.
66
#'
77
#' @param coloredmeshes fs.coloredmesh as returned by the coloredmesh.from.* functions.
88
#'

R/rglactions.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ perform.rglactions <- function(rglactions, at_index=NULL, silent=TRUE, ignore =
314314

315315
#' @title Create rglactions list, suitable to be passed as parameter to vis functions.
316316
#'
317-
#' @note List of all available rglactions: (1) `snapshot_png=filepath` takes a screenshot in PNG format and saves it in at `filepath`. (2) `trans_fun=function` uses the transformation function trans_fun to the data before mapping data values to colors and plotting. Popular transformation functions are \code{\link{limit_fun}}, \code{\link{limit_fun_na}}, and \code{\link{clip_fun}}. (3) `text=arglist` calls \code{\link{text3d}} with the given args after plotting. (4) `snapshot_vec=filepath` takes a screenshot in vector format and saves it in at `filepath`. You also need to set the format via `snapshot_vec_format`, valid entries are one of "ps", "eps", "tex", "pdf", "svg", "pgf" (default is 'eps'). This is experimental and may take a while.
317+
#' @note List of all available rglactions: (1) `snapshot_png=filepath` takes a screenshot in PNG format and saves it in at `filepath`. (2) `trans_fun=function` uses the transformation function trans_fun to the data before mapping data values to colors and plotting. Popular transformation functions are \code{\link{limit_fun}}, \code{\link{limit_fun_na}}, and \code{\link{clip_fun}}. (3) `text=arglist` calls \code{\link[rgl]{text3d}} with the given args after plotting. (4) `snapshot_vec=filepath` takes a screenshot in vector format and saves it in at `filepath`. You also need to set the format via `snapshot_vec_format`, valid entries are one of "ps", "eps", "tex", "pdf", "svg", "pgf" (default is 'eps'). This is experimental and may take a while.
318318
#'
319319
#' @return named list, an example `rlgactions` instance that will save a screenshot of the plot produced by the vis function in the current working directory (see \code{getwd}), under the name 'fsbrain_out.png'.
320320
#'

R/vis.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#'
1818
#' @param views list of strings. Valid entries include: 'si': single interactive view. 't4': tiled view showing the brain from 4 angles. 't9': tiled view showing the brain from 9 angles.
1919
#'
20-
#' @param rgloptions option list passed to \code{\link{par3d}}. Example: \code{rgloptions = list("windowRect"=c(50,50,1000,1000))}.
20+
#' @param rgloptions option list passed to \code{\link[rgl]{par3d}}. Example: \code{rgloptions = list("windowRect"=c(50,50,1000,1000))}.
2121
#'
2222
#' @param rglactions named list. A list in which the names are from a set of pre-defined actions. The values can be used to specify parameters for the action. The following example clips outliers in the data before plotting and writes a screenshot in PNG format: \code{rglactions = list("snapshot_png"="~/fsbrain.png", "clip_data"=c(0.05, 0.95))}. See \code{\link{rglactions}}.
2323
#'
@@ -27,7 +27,7 @@
2727
#'
2828
#' @param style character string, a rendering style, e.g., 'default', 'shiny' or 'semitransparent'.
2929
#'
30-
#' @param makecmap_options named list of parameters to pass to \code{\link{makecmap}}. Must not include the unnamed first parameter, which is derived from 'measure'. Should include at least a colormap function as name 'colFn'.
30+
#' @param makecmap_options named list of parameters to pass to \code{\link[squash]{makecmap}}. Must not include the unnamed first parameter, which is derived from 'measure'. Should include at least a colormap function as name 'colFn'.
3131
#'
3232
#' @param bg a background definition. Can be a surface color layer or a character string like 'curv_light' to select a pre-defined layer, see \code{\link[fsbrain]{collayer.bg}} for valid strings.
3333
#'

R/vis_meshes.R

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#'
1212
#' @param style a named list of style parameters or a string specifying an available style by name (e.g., 'shiny'). Defaults to 'default', the default style.
1313
#'
14-
#' @param rgloptions option list passed to \code{\link{par3d}}. Example: \code{rgloptions = list("windowRect"=c(50,50,1000,1000))};
14+
#' @param rgloptions option list passed to \code{\link[rgl]{par3d}}. Example: \code{rgloptions = list("windowRect"=c(50,50,1000,1000))};
1515
#'
1616
#' @param rglactions named list. A list in which the names are from a set of pre-defined actions. Defaults to the empty list.
1717
#'
@@ -172,17 +172,17 @@ vis.renderable <- function(cmesh, skip_all_na=TRUE, style="default") {
172172
#'
173173
#' @param style a named list of style parameters or a string specifying an available style by name (e.g., 'shiny'). Defaults to 'default', the default style.
174174
#'
175-
#' @param x rotation x axis value, passed to \code{\link{spin3d}}. Defaults to 0.
175+
#' @param x rotation x axis value, passed to \code{\link[rgl]{spin3d}}. Defaults to 0.
176176
#'
177-
#' @param y rotation y axis value, passed to \code{\link{spin3d}}. Defaults to 1.
177+
#' @param y rotation y axis value, passed to \code{\link[rgl]{spin3d}}. Defaults to 1.
178178
#'
179-
#' @param z rotation z axis value, passed to \code{\link{spin3d}}. Defaults to 0.
179+
#' @param z rotation z axis value, passed to \code{\link[rgl]{spin3d}}. Defaults to 0.
180180
#'
181-
#' @param rpm rotation rpm value, passed to \code{\link{spin3d}}. Defaults to 15.
181+
#' @param rpm rotation rpm value, passed to \code{\link[rgl]{spin3d}}. Defaults to 15.
182182
#'
183-
#' @param duration rotation duration value, passed to \code{\link{spin3d}}. Defaults to 20.
183+
#' @param duration rotation duration value, passed to \code{\link[rgl]{spin3d}}. Defaults to 20.
184184
#'
185-
#' @param rgloptions option list passed to \code{\link{par3d}}. Example: rgloptions = list("windowRect"=c(50,50,1000,1000));
185+
#' @param rgloptions option list passed to \code{\link[rgl]{par3d}}. Example: rgloptions = list("windowRect"=c(50,50,1000,1000));
186186
#'
187187
#' @param rglactions named list. A list in which the names are from a set of pre-defined actions. Defaults to the empty list.
188188
#'
@@ -228,13 +228,13 @@ vis.coloredmeshes.rotating <- function(coloredmeshes, background="white", skip_a
228228
#'
229229
#' @param coloredmeshes list of renderables. A coloredmesh is a named list as returned by the coloredmesh.from.* functions. It has the entries 'mesh' of type tmesh3d, a 'col', which is a color specification for such a mesh.
230230
#'
231-
#' @param rotation_angle angle in radians. Passed to \code{\link{rotate3d}}.
231+
#' @param rotation_angle angle in radians. Passed to \code{\link[rgl]{rotate3d}}.
232232
#'
233-
#' @param x x value passed to \code{\link{rotate3d}}.
233+
#' @param x x value passed to \code{\link[rgl]{rotate3d}}.
234234
#'
235-
#' @param y y value passed to \code{\link{rotate3d}}.
235+
#' @param y y value passed to \code{\link[rgl]{rotate3d}}.
236236
#'
237-
#' @param z z value passed to \code{\link{rotate3d}}.
237+
#' @param z z value passed to \code{\link[rgl]{rotate3d}}.
238238
#'
239239
#' @param style a named list of style parameters or a string specifying an available style by name (e.g., 'shiny'). Defaults to 'default', the default style.
240240
#'
@@ -309,7 +309,7 @@ vis.coloredmesh <- function(cmesh, style="default") {
309309
#'
310310
#' @param style A style definition. Can be a character string like 'shiny' or 'from_mesh', or already a named list of material properties (which will be returned as-is).
311311
#'
312-
#' @return a style, resolved to a parameter list compatible with \code{\link{material3d}}.
312+
#' @return a style, resolved to a parameter list compatible with \code{\link[rgl]{material3d}}.
313313
#'
314314
#' @keywords internal
315315
get.rglstyle.parameters <- function(renderable, style) {
@@ -334,13 +334,13 @@ get.rglstyle.parameters <- function(renderable, style) {
334334

335335
#' @title Get the default visualization style parameters as a named list.
336336
#'
337-
#' @description Run \code{\link{material3d}} without arguments to see valid style keywords to create new styles.
337+
#' @description Run \code{\link[rgl]{material3d}} without arguments to see valid style keywords to create new styles.
338338
#'
339339
#' @param style string. A style name. Available styles are one of: "default", "shiny", "semitransparent", "glass", "edges".
340340
#'
341-
#' @return a style, resolved to a parameter list compatible with \code{\link{material3d}}.
341+
#' @return a style, resolved to a parameter list compatible with \code{\link[rgl]{material3d}}.
342342
#'
343-
#' @seealso \code{\link{shade3d}} can use the returned style
343+
#' @seealso \code{\link[rgl]{shade3d}} can use the returned style
344344
#'
345345
#' @export
346346
get.rglstyle <- function(style) {
@@ -364,9 +364,9 @@ get.rglstyle <- function(style) {
364364

365365
#' @title Get the default visualization style parameters as a named list.
366366
#'
367-
#' @description The default rendering style, which is is rather plain. Does not look super fancy, but allows for clear data visualization without distractions. Hint: Run \code{\link{material3d}} without arguments to see valid style keywords to create new styles.
367+
#' @description The default rendering style, which is is rather plain. Does not look super fancy, but allows for clear data visualization without distractions. Hint: Run \code{\link[rgl]{material3d}} without arguments to see valid style keywords to create new styles.
368368
#'
369-
#' @return named list, style parameters that can be passed to \code{\link{shade3d}} via \code{\link{do.call}}.
369+
#' @return named list, style parameters that can be passed to \code{\link[rgl]{shade3d}} via \code{\link{do.call}}.
370370
#'
371371
#' @keywords internal
372372
get.rglstyle.default <- function() {
@@ -376,9 +376,9 @@ get.rglstyle.default <- function() {
376376

377377
#' @title Get the semi-transparent visualization style parameters as a named list.
378378
#'
379-
#' @description Semitransparent rendering style. This style has a very negative impact on rendering performance (in interactive mode). Hint: Run \code{\link{material3d}} without arguments to see valid style keywords to create new styles.
379+
#' @description Semitransparent rendering style. This style has a very negative impact on rendering performance (in interactive mode). Hint: Run \code{\link[rgl]{material3d}} without arguments to see valid style keywords to create new styles.
380380
#'
381-
#' @return named list, style parameters that can be passed to \code{\link{shade3d}} via \code{\link{do.call}}.
381+
#' @return named list, style parameters that can be passed to \code{\link[rgl]{shade3d}} via \code{\link{do.call}}.
382382
#'
383383
#' @keywords internal
384384
get.rglstyle.semitransparent <- function() {
@@ -390,7 +390,7 @@ get.rglstyle.semitransparent <- function() {
390390
#'
391391
#' @description Mesh edges rendering style. Zoom in enough to see them.
392392
#'
393-
#' @return named list, style parameters that can be passed to \code{\link{shade3d}} via \code{\link{do.call}}.
393+
#' @return named list, style parameters that can be passed to \code{\link[rgl]{shade3d}} via \code{\link{do.call}}.
394394
#'
395395
#' @keywords internal
396396
get.rglstyle.edges <- function() {
@@ -400,9 +400,9 @@ get.rglstyle.edges <- function() {
400400

401401
#' @title Get the glass visualization style parameters as a named list.
402402
#'
403-
#' @description Glass-brain rendering style. This style has a very negative impact on rendering performance (especially in interactive mode). Hint: Run \code{\link{material3d}} without arguments to see valid style keywords to create new styles.
403+
#' @description Glass-brain rendering style. This style has a very negative impact on rendering performance (especially in interactive mode). Hint: Run \code{\link[rgl]{material3d}} without arguments to see valid style keywords to create new styles.
404404
#'
405-
#' @return named list, style parameters that can be passed to \code{\link{shade3d}} via \code{\link{do.call}}.
405+
#' @return named list, style parameters that can be passed to \code{\link[rgl]{shade3d}} via \code{\link{do.call}}.
406406
#'
407407
#' @keywords internal
408408
get.rglstyle.glass <- function() {
@@ -412,9 +412,9 @@ get.rglstyle.glass <- function() {
412412

413413
#' @title Get the glass2 visualization style parameters as a named list.
414414
#'
415-
#' @description Glass-brain rendering style. This style has a very negative impact on rendering performance (especially in interactive mode). Hint: Run \code{\link{material3d}} without arguments to see valid style keywords to create new styles.
415+
#' @description Glass-brain rendering style. This style has a very negative impact on rendering performance (especially in interactive mode). Hint: Run \code{\link[rgl]{material3d}} without arguments to see valid style keywords to create new styles.
416416
#'
417-
#' @return named list, style parameters that can be passed to \code{\link{shade3d}} via \code{\link{do.call}}.
417+
#' @return named list, style parameters that can be passed to \code{\link[rgl]{shade3d}} via \code{\link{do.call}}.
418418
#'
419419
#' @keywords internal
420420
get.rglstyle.glass2 <- function() {
@@ -424,9 +424,9 @@ get.rglstyle.glass2 <- function() {
424424

425425
#' @title Get a shiny visualization style.
426426
#'
427-
#' @description A shiny or glossy rendering style. Looks a bit more modern, but the resulting highlights may make the interpretation of the plotted data a bit harder in some areas. Hint: Run \code{\link{material3d}} without arguments to see valid style keywords to create new styles.
427+
#' @description A shiny or glossy rendering style. Looks a bit more modern, but the resulting highlights may make the interpretation of the plotted data a bit harder in some areas. Hint: Run \code{\link[rgl]{material3d}} without arguments to see valid style keywords to create new styles.
428428
#'
429-
#' @return named list, style parameters that can be passed to to \code{\link{shade3d}} via \code{\link{do.call}}.
429+
#' @return named list, style parameters that can be passed to to \code{\link[rgl]{shade3d}} via \code{\link{do.call}}.
430430
#'
431431
#' @keywords internal
432432
get.rglstyle.shiny <- function() {

R/vis_volume.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,7 @@ normalize <- function(x) {
723723

724724
#' @title Return triangles for a 3D cube or cuboid.
725725
#'
726-
#' @description Each row of the returned matrix encodes a point (the x, y, and z coordinates), and 3 consecutive rows encode a triangle. Obvisouly, a point will occur several times (as part of several triangles). The result can be passed to \code{\link{triangles3d}} to render a 3D box. The defaults for the parameters will create a cube with edge length 1 centered at (0, 0, 0).
726+
#' @description Each row of the returned matrix encodes a point (the x, y, and z coordinates), and 3 consecutive rows encode a triangle. Obvisouly, a point will occur several times (as part of several triangles). The result can be passed to \code{\link[rgl]{triangles3d}} to render a 3D box. The defaults for the parameters will create a cube with edge length 1 centered at (0, 0, 0).
727727
#'
728728
#' @param xmin numeric, minimal x coordinate
729729
#'

R/vis_volume_3d.R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#'
1212
#' @param voxelcol character string or a *voxel coloring*. A *voxel coloring* can be specified in three ways: 1) the string 'from_intensity' will compute colors based on the intensity values of the foreground voxels in the volume, applying normalization of the intensity values if needed. 2) an array of RGB color strings: will be used to retrieve the colors for all foreground vertices, at their CRS indices. 3) A vector with length identical to the number of foreground voxels in the volume: will be applied directly. Obvisouly, you should not pass a color material parameter (see `...`) when using this.
1313
#'
14-
#' @param ... material properties, passed to \code{\link{triangles3d}}. Example: \code{color = "#0000ff", lit=FALSE}.
14+
#' @param ... material properties, passed to \code{\link[rgl]{triangles3d}}. Example: \code{color = "#0000ff", lit=FALSE}.
1515
#'
1616
#' @examples
1717
#' \dontrun{
@@ -339,15 +339,15 @@ apply.transform <- function(object, matrix_fun) {
339339

340340
#' @title Draw 3D boxes at locations using rgl.
341341
#'
342-
#' @description Draw 3D boxes at all given coordinates using rgl, analogous to \code{\link{spheres3d}}. Constructs the coordinates for triangles making up the boxes, then uses \code{\link{triangles3d}} to render them.
342+
#' @description Draw 3D boxes at all given coordinates using rgl, analogous to \code{\link[rgl]{spheres3d}}. Constructs the coordinates for triangles making up the boxes, then uses \code{\link[rgl]{triangles3d}} to render them.
343343
#'
344344
#' @param centers numerical matrix with 3 columns. Each column represents the x, y, z coordinates of a center at which to create a cube.
345345
#'
346346
#' @param r numerical vector or scalar, the cube edge length. This is the length of the axis-parallel edges of the cube. The vector must have length 1 (same edge length for all cubes), or the length must be identical to the number of rows in parameter `centers`.
347347
#'
348348
#' @param voxelcol vector of rgb color strings for the individual voxels. Its length must be identical to \code{nrow(centers)} if given.
349349
#'
350-
#' @param ... material properties, passed to \code{\link{triangles3d}}. Example: \code{color = "#0000ff", lit=FALSE}.
350+
#' @param ... material properties, passed to \code{\link[rgl]{triangles3d}}. Example: \code{color = "#0000ff", lit=FALSE}.
351351
#'
352352
#' @param do_show logical, whether to visualize the result in the current rgl scene
353353
#'

man/cube3D.tris.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)