Skip to content
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.

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

Prune #403

Merged
merged 35 commits into from Jan 31, 2020
Merged

Prune #403

merged 35 commits into from Jan 31, 2020

Conversation

alexanderbates
Copy link
Collaborator

  • Prune neuron interactively
  • Prune neuron within a volume

alexanderbates and others added 16 commits July 19, 2019 17:20
* Interactively re-reoot a neuron, or neurons in a neuronlist, by choosing a more appropriate leaf node
* Generate a 3D model from connector and/or tree node data
* master:
  dev: travis build status should be for master branch
  redown
  Bump version/NEWS
  dev: ignore spare directory
  Spelling
* since it will often already be a surface
* also check that input is an hxsurf if neuropil argument is non-null
* also remove references in example to interactive pruning (this isn't)
* new groupings for 3d/interactive functions
* still need to regenerate
* causes latex error on travis, so not worth it
@coveralls
Copy link

coveralls commented Aug 1, 2019

Coverage Status

Coverage decreased (-2.04%) to 81.413% when pulling 51a6958 on prune into a4ed90f on master.

@jefferis jefferis added this to In progress in natverse-paper Aug 1, 2019
@jefferis jefferis moved this from In progress to Review in progress in natverse-paper Aug 1, 2019
* this means you can set up the scene at the start rather than continually replotting it
* we need this now since we don't blast the plot repeatedly with clear3d
* i.e. the fact that select_points no longer clears
* also make prune_online use pop rather than clear
@jefferis
Copy link
Collaborator

jefferis commented Aug 5, 2019

I think the conclusion is that manually_assign_axon_dendrite might not belong as part of this PR. Could you remove?

@jefferis
Copy link
Collaborator

jefferis commented Aug 6, 2019

Thanks @alexanderbates! Could you fix a couple of doc typos and re-roxygenise?

chossign make_model.Rd:21
conists make_model.Rd:11,28

NAMESPACE Outdated
export(xformimage)
export(xformpoints)
export(xyzmatrix)
export(xyzpos)
import(grDevices)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not quite sure how this all got deleted two commits back ...

R/interactive.R Outdated
@@ -21,8 +21,7 @@
#' @export
#' @rdname prune_online
prune_online <-function(x, ...) UseMethod("prune_online")
#' @export
#' @rdname prune_online

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think they need to be exported. Was there a reason not to? NB this has a different meaning for methods vs functions.

@jefferis jefferis merged commit 7cefd30 into master Jan 31, 2020
natverse-paper automation moved this from Review in progress to Done Jan 31, 2020
@jefferis jefferis deleted the prune branch February 3, 2020 15:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Development

Successfully merging this pull request may close these issues.

None yet

3 participants