Skip to content

Commit

Permalink
chore: update and clean for R4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
jul committed Jan 17, 2022
1 parent e9f1387 commit 21c1620
Show file tree
Hide file tree
Showing 18 changed files with 44 additions and 14 deletions.
11 changes: 8 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@ Package: hastaLaVista
Type: Package
Title: visualize metabolomics data interactively
Version: 0.1.1
Author: person("Julien", "Wist", email = "julien.wist@correounivalle.edu.co", role = c("aut", "cre"))
Maintainer: Julien Wist <julien.wist@correounivalle.edu.co>
Authors@R: person(given = "Julien",
family = "Wist",
role = c("aut", "cre"),
email = "julien.wist@correounivalle.edu.co",
comment = c(ORCID = "0000-0002-3416-2572"))
Description: To connect R results to github.com/npellet/visualizer project using my.cheminfo.org.
This allows to interactively display data with R.
R is a powerfull software for data analysis, however it lacks the possibility to display data in an interactive fashion.
Expand All @@ -14,7 +17,9 @@ Depends: R (>= 3.1.0)
License: MIT + file LICENSE
Encoding: UTF-8
LazyData: true
RoxygenNote: 7.1.1
LazyDataCompression: none
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.1.2
Imports:
jsonlite (>= 1.5),
servr (>= 0.10),
Expand Down
5 changes: 5 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,10 @@ exportClasses(server)
exportClasses(visualization)
exportMethods(useThisFolder)
exportMethods(visualize)
importFrom(jsonlite,fromJSON)
importFrom(jsonlite,toJSON)
importFrom(methods,hasArg)
importFrom(rstudioapi,translateLocalUrl)
importFrom(utils,capture.output)
importFrom(utils,str)
importFrom(utils,tail)
1 change: 1 addition & 0 deletions R/ClassServer.R
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#' @slot port the port to which the server listen
#' @slot path the path relative to the server root directory
#' @slot protocole a protocole
#' @slot rootDir root directory where to install the visualizer application
#' @slot init if TRUE an instance of \pkg{servr::httw()} will be started to serve the files
#' @return an url object
#' @examples
Expand Down
2 changes: 2 additions & 0 deletions R/checkMetadata.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#' @title checkMetadata
#' @param dataFrame - metadata
#' @param option - options
#' @description
#' This function check and prepare a metadata dataframe to be used within hastaLaVista
#' framework. It may contain as much column as necessary, but should be of type
Expand Down
2 changes: 2 additions & 0 deletions R/print.server.R
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@
#'
#' @export
#' @importFrom methods hasArg
#' @importFrom rstudioapi translateLocalUrl

print.server <- function(x, ...){
translate <- NULL
if (x@port == 0) {
url <- paste0(x@protocole, x@baseURL, x@path)
} else {
Expand Down
3 changes: 3 additions & 0 deletions R/startWSServer.R
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@
#' @examples
#' # conn <- startWSServer()
#' @export
#' @importFrom jsonlite fromJSON toJSON
#' @importFrom utils capture.output str

startWSServer <- function(port){
from <- init <- NULL
httpuv::stopAllServers()
cat("Starting server on port 7356 \n")
s <- httpuv::startServer("0.0.0.0", 7356,
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ Notebooks already offer this possibility, however notebooks only provide basic f

Make sure that *devtools* package is installed and run the following command in the R console.

options(timeout=1000)
devtools::install_github("jwist/hastaLaVista")

## post-installation
Expand Down
Binary file modified data/bariatricRat.binned.4.rda
Binary file not shown.
Binary file modified data/bariatricRat.binned.5.rda
Binary file not shown.
Binary file modified data/bariatricRat.rda
Binary file not shown.
Binary file modified data/coffeeNMRSpectra.rda
Binary file not shown.
6 changes: 3 additions & 3 deletions man/bariatricRat.Rd

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

4 changes: 2 additions & 2 deletions man/bariatricRat.binned.4.Rd

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

4 changes: 2 additions & 2 deletions man/bariatricRat.binned.5.Rd

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

11 changes: 10 additions & 1 deletion man/checkMetadata.Rd

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

4 changes: 2 additions & 2 deletions man/coffeeNMRSpectra.Rd

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

2 changes: 2 additions & 0 deletions man/server-class.Rd

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

2 changes: 1 addition & 1 deletion man/useThisFolder-visualization-method.Rd

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

0 comments on commit 21c1620

Please sign in to comment.