Skip to content

Commit

Permalink
doc/pkgdown tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
jefferis committed Mar 28, 2018
1 parent 5523ab7 commit 62108ff
Show file tree
Hide file tree
Showing 19 changed files with 66 additions and 27 deletions.
16 changes: 10 additions & 6 deletions R/ReadIgorBinary.R
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
#' # make a list containing the wave's data in the users's environment
#' wavename=read.ibw(system.file("igor","version5.ibw",package="IgorR"),MakeWave=TRUE)
#' sum(get(wavename))
#' @family igor-io
read.ibw<-function(wavefile,Verbose=FALSE,ReturnTimeSeries=FALSE,
MakeWave=FALSE,HeaderOnly=FALSE){
if (is.character(wavefile)) {
Expand Down Expand Up @@ -152,6 +153,7 @@ read.ibw<-function(wavefile,Verbose=FALSE,ReturnTimeSeries=FALSE,
#' @author jefferis
#' @export
#' @import bitops
#' @family igor-io
#' @examples
#' r=read.pxp(system.file("igor","testexpt.pxp",package="IgorR"))
read.pxp<-function(pxpfile,regex,ReturnTimeSeries=FALSE,Verbose=FALSE,
Expand Down Expand Up @@ -786,17 +788,19 @@ if(R.version$major>2) {
}

#' Convert an Igor wave (wave list) loaded by read.ibw into an R time series
#'
#' Where there are multiple waves, they are assumed to be of compatible lengths
#'
#' Where there are multiple waves, they are assumed to be of compatible lengths
#' so that they can be joined together by \code{cbind}.
#'
#'
#' @param WaveData, a wave or list of waves
#' @param ReturnOriginalDataOnError If we can't make a time series, return
#' return original data (default TRUE)
#' @return a time series or multi time series (\code{ts}, \code{mts})
#' return original data (default TRUE)
#' @return a time series or multi time series (\code{\link[stats]{ts}},
#' \code{mts})
#' @author jefferis
#' @export
#' @importFrom stats ts
#' @family igor-io
WaveToTimeSeries<-function(WaveData,ReturnOriginalDataOnError=TRUE){
if(is.list(WaveData)) {
# process separate waves into multi wave time series
Expand All @@ -817,7 +821,7 @@ WaveToTimeSeries<-function(WaveData,ReturnOriginalDataOnError=TRUE){
#' @param wave Igor wave loaded by \code{read.ibw} or\code{read.pxp}
#' @return numeric vector with elements start, end, frequency
#' @author jefferis
#' @seealso \code{\link{tsp}}
#' @seealso \code{\link[stats]{tsp}}
#' @export
tsp.igorwave<-function(wave){
bh=attr(wave,"BinHeader")
Expand Down
2 changes: 1 addition & 1 deletion docs/authors.html

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

2 changes: 1 addition & 1 deletion docs/index.html

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

2 changes: 1 addition & 1 deletion docs/reference/IgorR-package.html

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

2 changes: 1 addition & 1 deletion docs/reference/IgorR-private.html

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

2 changes: 1 addition & 1 deletion docs/reference/ReadAllNclampLogTables.html

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

2 changes: 1 addition & 1 deletion docs/reference/ReadNclampLogTable.html

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

2 changes: 1 addition & 1 deletion docs/reference/SummariseSweepFile.html

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

2 changes: 1 addition & 1 deletion docs/reference/SweepFilesToDataFrame.html

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

2 changes: 1 addition & 1 deletion docs/reference/UpdateSweepDataFrame.html

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

16 changes: 12 additions & 4 deletions docs/reference/WaveToTimeSeries.html

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

2 changes: 1 addition & 1 deletion docs/reference/index.html

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

9 changes: 8 additions & 1 deletion docs/reference/read.ibw.html

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

9 changes: 8 additions & 1 deletion docs/reference/read.pxp.html

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

4 changes: 2 additions & 2 deletions docs/reference/tsp.igorwave.html

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

9 changes: 7 additions & 2 deletions man/WaveToTimeSeries.Rd

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

4 changes: 4 additions & 0 deletions man/read.ibw.Rd

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

4 changes: 4 additions & 0 deletions man/read.pxp.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/tsp.igorwave.Rd

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

0 comments on commit 62108ff

Please sign in to comment.