Skip to content

Commit fe1c4ab

Browse files
authored
Merge pull request #90 from boshek/master
Small cosmetic changes to documentation
2 parents 5d2d5ba + 0601125 commit fe1c4ab

File tree

12 files changed

+27
-11
lines changed

12 files changed

+27
-11
lines changed

.Rbuildignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,5 @@ changelog.txt
44
^.*\.Rproj$
55
^\.Rproj\.user$
66
README.md
7-
87
^README\.Rmd$
9-
^README-.*\.png$
8+

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.Rproj.user
22
.Rhistory
33
.RData
4-
*.Rproj
4+
55

NEWS.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
* Add split and merge vignette
77

88
# rLakeAnalyzer 1.10.0
9-
10-
119
* Added split and merge algorithm to package which enable auto detection of clines (e.g thermoclines)
1210

1311

README-example-1.png

-19.8 KB
Binary file not shown.

README-example-2.png

-14.2 KB
Binary file not shown.

README.Rmd

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@ output: github_document
88
knitr::opts_chunk$set(
99
collapse = TRUE,
1010
comment = "#>",
11-
fig.path = "README-"
11+
fig.path = "tools/readme/README-"
1212
)
1313
```
1414

1515
[![Build Status](https://travis-ci.org/GLEON/rLakeAnalyzer.svg?branch=master)](https://travis-ci.org/GLEON/rLakeAnalyzer)
16+
[![CRAN\_Status\_Badge](http://www.r-pkg.org/badges/version/rLakeAnalyzer)](https://cran.r-project.org/package=rLakeAnalyzer)
1617
[![Download Count](http://cranlogs.r-pkg.org/badges/rLakeAnalyzer)]( https://cran.r-project.org/web/packages/rLakeAnalyzer/index.html)
1718
[![DOI](https://zenodo.org/badge/23404/GLEON/rLakeAnalyzer.svg)](https://zenodo.org/badge/latestdoi/23404/GLEON/rLakeAnalyzer)
1819

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
<!-- README.md is generated from README.Rmd. Please edit that file -->
3-
[![Build Status](https://travis-ci.org/GLEON/rLakeAnalyzer.svg?branch=master)](https://travis-ci.org/GLEON/rLakeAnalyzer) [![Download Count](http://cranlogs.r-pkg.org/badges/rLakeAnalyzer)](https://cran.r-project.org/web/packages/rLakeAnalyzer/index.html) [![DOI](https://zenodo.org/badge/23404/GLEON/rLakeAnalyzer.svg)](https://zenodo.org/badge/latestdoi/23404/GLEON/rLakeAnalyzer)
3+
[![Build Status](https://travis-ci.org/GLEON/rLakeAnalyzer.svg?branch=master)](https://travis-ci.org/GLEON/rLakeAnalyzer) [![CRAN\_Status\_Badge](http://www.r-pkg.org/badges/version/rLakeAnalyzer)](https://cran.r-project.org/package=rLakeAnalyzer) [![Download Count](http://cranlogs.r-pkg.org/badges/rLakeAnalyzer)](https://cran.r-project.org/web/packages/rLakeAnalyzer/index.html) [![DOI](https://zenodo.org/badge/23404/GLEON/rLakeAnalyzer.svg)](https://zenodo.org/badge/latestdoi/23404/GLEON/rLakeAnalyzer)
44

55
rLakeAnalyzer
66
=============
@@ -30,6 +30,7 @@ First the package must be loaded into R:
3030

3131
``` r
3232
library(rLakeAnalyzer)
33+
#> Warning: package 'rLakeAnalyzer' was built under R version 3.4.3
3334
```
3435

3536
You can view a list of functions available in rLakeAnalyzer with:
@@ -51,15 +52,15 @@ sp.wtr = load.ts(wtr.path)
5152
wtr.heat.map(sp.wtr)
5253
```
5354

54-
![](README-example-1.png)
55+
![](tools/readme/README-example-1.png)
5556

5657
``` r
5758

5859
#Change defaults supplied to filled.contour
5960
wtr.heat.map(sp.wtr, zlim=c(0,15), plot.title="Sparkling Water Temp (C)")
6061
```
6162

62-
![](README-example-2.png)
63+
![](tools/readme/README-example-2.png)
6364

6465
Getting Help or Reporting an Issue
6566
----------------------------------

rLakeAnalyzer.Rproj

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
Version: 1.0
2+
3+
RestoreWorkspace: Default
4+
SaveWorkspace: Default
5+
AlwaysSaveHistory: Default
6+
7+
EnableCodeIndexing: Yes
8+
UseSpacesForTab: Yes
9+
NumSpacesForTab: 2
10+
Encoding: UTF-8
11+
12+
RnwWeave: Sweave
13+
LaTeX: pdfLaTeX
14+
15+
BuildType: Package
16+
PackageUseDevtools: Yes
17+
PackageInstallArgs: --no-multiarch --with-keep.source

tools/readme/README-example-1.png

18.7 KB
Loading

tools/readme/README-example-2.png

13.2 KB
Loading

0 commit comments

Comments
 (0)