Skip to content

Commit

Permalink
Clarify that catmaid_get_connector_table returns query treenode ids
Browse files Browse the repository at this point in the history
* closes #107
  • Loading branch information
jefferis committed Apr 9, 2019
1 parent e0538a7 commit 057e6a1
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
9 changes: 5 additions & 4 deletions R/catmaid_skeleton.R
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,8 @@ catmaid_get_connectors<-function(connector_ids, pid=1, conn=NULL, raw=FALSE, ...
#'
#' \item user_id
#'
#' \item partner_treenode_id
#' \item treenode_id (NB this is always the treenode id of the query skeleton
#' whether or not incoming or outgoing connections are requested)
#'
#' \item last_modified
#'
Expand Down Expand Up @@ -174,7 +175,7 @@ catmaid_get_connectors<-function(connector_ids, pid=1, conn=NULL, raw=FALSE, ...
#'
#' \item username
#'
#' \item partner_treenode_id
#' \item treenode_id
#'
#' \item last_modified
#'
Expand Down Expand Up @@ -260,10 +261,10 @@ catmaid_get_connector_table<-function(skids,
# else process the connector information
dfcolnames <- if(catmaid_version(numeric = TRUE)>="2016.09.01-77") {
c("skid", "connector_id", "x", "y", "z", "confidence",
"user_id", "partner_treenode_id", "last_modified")
"user_id", "treenode_id", "last_modified")
} else {
c("connector_id", "partner_skid", "x", "y", "z", "s", "confidence",
"tags", "nodes_in_partner", "username", "partner_treenode_id",
"tags", "nodes_in_partner", "username", "treenode_id",
"last_modified")
}
df=list2df(ctl[[1]], cols = dfcolnames, return_empty_df = T, stringsAsFactors=FALSE)
Expand Down
5 changes: 3 additions & 2 deletions man/catmaid_get_connector_table.Rd

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

0 comments on commit 057e6a1

Please sign in to comment.