Skip to content

Change rgl.* calls to *3d #508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jefferis merged 3 commits into from
Jan 28, 2023
Merged

Change rgl.* calls to *3d #508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4873700
Change rgl.* calls to *3d
dmurdoch Jan 9, 2023
5cc8562
rgl.pop -> pop3d
jefferis Jan 13, 2023
ad29cdc
ignore codecov
jefferis Jan 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .Rbuildignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ travisbuildchildren.sh
^pkgdown$
^\.github$
^depends.Rds$
^codecov\.yml$
4 changes: 2 additions & 2 deletions R/neuronlist.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ as.data.frame.neuronlist<-function(x, row.names = names(x), optional = FALSE, ..
#' open3d()
#' plot3d(kcs.reduced,col='red', lwd=2)
#' plot3d(kcs20,col='grey')
#' rgl.close()
#' close3d()
#'
#' \dontrun{
#' # example of using plyr's .inform argument for debugging error conditions
Expand Down Expand Up @@ -464,7 +464,7 @@ as.data.frame.neuronlist<-function(x, row.names = names(x), optional = FALSE, ..
#' open3d()
#' plot3d(kcs20[1:3])
#' plot3d(xyzflip)
#' rgl.close()
#' close3d()
#' }
#'
#' \dontrun{
Expand Down
8 changes: 4 additions & 4 deletions R/neuronlist_interactive_3d.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,8 @@ nlscan <- function(neurons, db=NULL,
if(Wait){
chc <- readline("Return to continue, b to go back, s to select, d [save to disk], t to stop, c to cancel (without returning a selection): ")
if(chc=="c" || chc=='t'){
sapply(pl, rgl.pop, type='shape')
sapply(more_rgl_ids, rgl.pop, type='shape')
sapply(pl, pop3d, type='shape')
sapply(more_rgl_ids, pop3d, type='shape')
break
}
if(chc=="s") {
Expand All @@ -211,8 +211,8 @@ nlscan <- function(neurons, db=NULL,
Sys.sleep(sleep)
i <- i+1
}
sapply(pl, rgl.pop, type='shape')
sapply(more_rgl_ids, rgl.pop, type='shape')
sapply(pl, pop3d, type='shape')
sapply(more_rgl_ids, pop3d, type='shape')
}
if(is.null(chc) || chc=='c') return(NULL)
if(!is.null(selected_file)) savetodisk(selected, selected_file)
Expand Down
4 changes: 2 additions & 2 deletions man/nlapply.Rd
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tests/testthat/test-hxsurf.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ test_that("we can read hxsurf object", {
plot3d(surf,alpha=0.2)
nclear3d()
plot3d(surf,col=rainbow,alpha=0.2)
rgl.close()
close3d()

#For plotly..
options(nat.plotengine='plotly')
Expand Down
2 changes: 1 addition & 1 deletion tests/testthat/test-neuronlist.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ test_that("basic interactive 3d functionality",{
expect_equal(find.soma(selfun, db=Cell07PNs, rval='neuronlist'),
Cell07PNs[sel_soma])

rgl.close()
close3d()
})

context("neuronlist: set operations")
Expand Down
6 changes: 3 additions & 3 deletions tests/testthat/test-pop3d.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ context("npop3d")

test_that("pop last plotted neurons",{
nopen3d()
original.rgl.ids=rgl.ids()
original.rgl.ids=ids3d()
plot3d(c("EBH11R", "EBH20L"), db=Cell07PNs)
npop3d()
expect_equal(rgl.ids(), original.rgl.ids)
rgl.close()
expect_equal(ids3d(), original.rgl.ids)
close3d()
})

context("nview3d")
Expand Down