Issue #56 #57
Merged
Issue #56 #57
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…upport, modified ReconstructedOutline.R and retistruct.R to pass in the shiny output object, to allow rendering support for shiny, removed the old gui file.
…d removed old dependencies from DESCRIPTION, removed root volume from shinyFiles directory select.
davidcsterratt
requested changes
Jan 30, 2025
|
|
||
| report(paste("Mapping optimised. Deformation energy E:", format(self$opt$value, 5), | ||
| ";", self$nflip, "flipped triangles.")) | ||
| }, | ||
| }, |
There was a problem hiding this comment.
Picky, but remove white space at end of line.
| datapoints=FALSE, landmarks=FALSE, | ||
| image=FALSE) | ||
| }) | ||
| } else if (!is.na(dev.flat)) { |
There was a problem hiding this comment.
Not sure this needs to be "else if". I suppose we might want to do both, though it's unliikely.
| datapoints=FALSE, landmarks=FALSE, | ||
| image=FALSE) | ||
| }) | ||
| } else if (!is.na(dev.flat)) { |
There was a problem hiding this comment.
See previous comment about "else if".
pkg/retistruct/R/app.R
Outdated
| @@ -0,0 +1,11 @@ | |||
| ##' Start the Retistruct GUI | |||
| ##' @seealso gWidgets2 | |||
There was a problem hiding this comment.
I don't think we need this line - we're not using gWidgets any more.
pkg/retistruct/R/app.R
Outdated
| ##' @importFrom shiny shinyApp | ||
| ##' @export | ||
| retistruct <- function() { | ||
| options(rgl.useNULL = TRUE) ## Prevents rgl from making it's own window |
pkg/retistruct/R/server-handlers.R
Outdated
| @@ -0,0 +1,388 @@ | |||
| ## Converts projections into a function, as values returned from ui are strings. | |||
| translateProjections <- function() { | |||
| return(list('0' = azimuthal.equidistant, | |||
There was a problem hiding this comment.
Picky: I would probably use double quotes here to match code elsewhere.
pkg/retistruct/R/server.R
Outdated
| ##' @description The R shiny server responsible for storing a state for each | ||
| ##' session, handling inputs from the UI to the server, and plotting outputs | ||
| ##' to the UI. The arguments are all handled by the shiny package and this | ||
| ##' function should not be insantiated manually. |
There was a problem hiding this comment.
insantiated -> instantiated
(picked up by the spell checker)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This mostly resolves #56, porting the Retistruct GUI in R Shiny, however there is still some work to be completed.
Tasks that have so far been completed:
Tasks still left to do/issues to fix:
retistruct()call.identify()function no longer being used.