From 8fa8751ba4f0d13d4fa9f460398b3ae44d2440e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Sch=C3=A4fer?= Date: Fri, 25 Mar 2022 15:58:06 +0100 Subject: [PATCH] bump version, up dependency versions, docs+test fix --- DESCRIPTION | 8 ++++---- man/linear_interpolate_kdtree.Rd | 2 +- tests/testthat/test_kdtree.R | 6 ++++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 38109d2..5d1ea04 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,17 +1,17 @@ Package: haze Type: Package Title: Smoothing of per-Vertex Data on Triangular Meshes -Version: 0.0.1 +Version: 0.1.0 Authors@R: person("Tim", "Schäfer", role = c("aut", "cre"), email = "ts+code@rcmd.org", comment = c(ORCID = "0000-0002-3683-8070")) Maintainer: Tim Schäfer -Description: Smoothing of per-vertex data on triangular meshes. Supports nearest-neighbor smoothing and Gaussian smoothing based on geodesic distances. +Description: Smoothing of per-vertex data on triangular meshes, sub mesh creation based on vertex indices, per-vertrex data interpolation based on k-d trees. License: MIT + file LICENSE Encoding: UTF-8 URL: https://github.com/dfsp-spirit/haze BugReports: https://github.com/dfsp-spirit/haze/issues SystemRequirements: C++11 Imports: - freesurferformats (>= 0.1.14), + freesurferformats (>= 0.1.17), Rcpp (>= 1.0.6), Rvcg (>= 0.20.2) Suggests: @@ -19,7 +19,7 @@ Suggests: rmarkdown, testthat (>= 3.0.0), rgl, - fsbrain (>= 0.4.3) + fsbrain (>= 0.5.3) VignetteBuilder: knitr RoxygenNote: 7.1.2 Config/testthat/edition: 3 diff --git a/man/linear_interpolate_kdtree.Rd b/man/linear_interpolate_kdtree.Rd index 3a7ae86..e3431fd 100644 --- a/man/linear_interpolate_kdtree.Rd +++ b/man/linear_interpolate_kdtree.Rd @@ -2,7 +2,7 @@ % Please edit documentation in R/kdtree.R \name{linear_interpolate_kdtree} \alias{linear_interpolate_kdtree} -\title{Map input values at points in 3D space onto mesh vertices.} +\title{Interpolate per-vertex data at the query points. Or map per-vertex data between subjects.} \usage{ linear_interpolate_kdtree( query_coordinates, diff --git a/tests/testthat/test_kdtree.R b/tests/testthat/test_kdtree.R index ffd4cac..34ef103 100644 --- a/tests/testthat/test_kdtree.R +++ b/tests/testthat/test_kdtree.R @@ -65,8 +65,10 @@ testthat::test_that("One can map per-vertex data between spherical meshes.", { # but it is very easy to see it. Here is how you can check: do_plot = FALSE; if(do_plot) { - fsbrain::vis.fs.surface(source_mesh, per_vertex_data = source_pervertex_data); - fsbrain::vis.fs.surface(dest_mesh, per_vertex_data = dest_pervertex_data); + if(requireNamespace("fsbrain", quietly = TRUE)) { + fsbrain::vis.fs.surface(source_mesh, per_vertex_data = source_pervertex_data); + fsbrain::vis.fs.surface(dest_mesh, per_vertex_data = dest_pervertex_data); + } } })