diff --git a/DESCRIPTION b/DESCRIPTION index 18ef3eb..a6161b8 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: nat.flybrains Type: Package Title: Additional data for use with the NeuroAnatomy Toolbox (nat) -Version: 1.7.2 +Version: 1.7.3 Authors@R: c( person("Gregory", "Jefferis", email = "jefferis@gmail.com", role = c("aut"), comment = c(ORCID = "0000-0002-0587-9355")), diff --git a/NEWS.md b/NEWS.md index 43dc30a..75e8d4f 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,7 @@ +# nat.flybrains 1.7.3 + +* add citation + # nat.flybrains 1.7.2 * Add `JRC2018F` female template brain and surface, the first of the Bogovic diff --git a/docs/authors.html b/docs/authors.html index d4f4fe9..ededa6c 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -6,7 +6,7 @@ -Authors • nat.flybrains +Citation and Authors • nat.flybrains @@ -30,7 +30,7 @@ - + @@ -47,7 +47,7 @@ -
+
@@ -109,21 +109,21 @@

Installation

This package is fully functional but there are presently no plans to release a version to CRAN, since there is a significant amount of data included with the package (and CRAN discourages large packages).

You can, however, download the tar ball, and run R CMD INSTALL on it, or (highly recommended) use the devtools package to install straight from github:

- +
# install devtools package if you don't already have it
+if (!require("devtools")) install.packages("devtools")
+# nb this will install the generic templatebrains package from CRAN
+devtools::install_github("jefferislab/nat.flybrains")
+
+# to install additional/updated registrations 
+# (beyond those distributed as part of the R package)
+# Strongly recommended!
+nat.flybrains::download_jefferislab_registrations()

Note: Windows users need Rtools and devtools to install this way.

- diff --git a/docs/news/index.html b/docs/news/index.html index 988378f..8235908 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -60,7 +60,7 @@ nat.flybrains - 1.7.2 + 1.7.3 @@ -103,6 +103,13 @@

Changelog

Source: NEWS.md +
+

+nat.flybrains 1.7.3

+ +

nat.flybrains 1.7.2

@@ -185,6 +192,7 @@

Contents

-

Site built with pkgdown 1.2.0.

+

Site built with pkgdown 1.3.0.

diff --git a/docs/pkgdown.css b/docs/pkgdown.css index 2e4f0cf..c03fb08 100644 --- a/docs/pkgdown.css +++ b/docs/pkgdown.css @@ -65,7 +65,7 @@ summary { /* Typographic tweaking ---------------------------------*/ -.contents h1.page-header { +.contents .page-header { margin-top: calc(-60px + 1em); } diff --git a/docs/pkgdown.js b/docs/pkgdown.js index 706ad58..eb7e83d 100644 --- a/docs/pkgdown.js +++ b/docs/pkgdown.js @@ -25,6 +25,10 @@ for (var i = 0; i < links.length; i++) { if (links[i].getAttribute("href") === "#") continue; + // Ignore external links + if (links[i].host !== location.host) + continue; + var nav_path = paths(links[i].pathname); var length = prefix_length(nav_path, cur_path); @@ -52,13 +56,14 @@ return(pieces); } + // Returns -1 if not found function prefix_length(needle, haystack) { if (needle.length > haystack.length) - return(0); + return(-1); // Special case for length-0 haystack, since for loop won't run if (haystack.length === 0) { - return(needle.length === 0 ? 1 : 0); + return(needle.length === 0 ? 0 : -1); } for (var i = 0; i < haystack.length; i++) { diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml index 8be84ef..4a4f52a 100644 --- a/docs/pkgdown.yml +++ b/docs/pkgdown.yml @@ -1,5 +1,5 @@ -pandoc: 2.3.1 -pkgdown: 1.2.0 +pandoc: 1.19.2.1 +pkgdown: 1.3.0 pkgdown_sha: ~ articles: [] diff --git a/docs/reference/Dmel.html b/docs/reference/Dmel.html index e4cfc20..302cc21 100644 --- a/docs/reference/Dmel.html +++ b/docs/reference/Dmel.html @@ -68,7 +68,7 @@ nat.flybrains - 1.7.2 + 1.7.3 @@ -160,7 +160,7 @@

Contents

-

Site built with pkgdown 1.2.0.

+

Site built with pkgdown 1.3.0.

diff --git a/docs/reference/DsecI.html b/docs/reference/DsecI.html index b83b8ae..8a1a0d3 100644 --- a/docs/reference/DsecI.html +++ b/docs/reference/DsecI.html @@ -70,7 +70,7 @@ nat.flybrains - 1.7.2 + 1.7.3 @@ -159,7 +159,7 @@

Contents

-

Site built with pkgdown 1.2.0.

+

Site built with pkgdown 1.3.0.

diff --git a/docs/reference/Dsim.html b/docs/reference/Dsim.html index 100fb09..aab60d2 100644 --- a/docs/reference/Dsim.html +++ b/docs/reference/Dsim.html @@ -68,7 +68,7 @@ nat.flybrains - 1.7.2 + 1.7.3 @@ -160,7 +160,7 @@

Contents

-

Site built with pkgdown 1.2.0.

+

Site built with pkgdown 1.3.0.

diff --git a/docs/reference/Dvir.html b/docs/reference/Dvir.html index 0943f0c..e72dc1e 100644 --- a/docs/reference/Dvir.html +++ b/docs/reference/Dvir.html @@ -68,7 +68,7 @@ nat.flybrains - 1.7.2 + 1.7.3 @@ -160,7 +160,7 @@

Contents

-

Site built with pkgdown 1.2.0.

+

Site built with pkgdown 1.3.0.

diff --git a/docs/reference/FCWB.html b/docs/reference/FCWB.html index c1b969f..b8c6e99 100644 --- a/docs/reference/FCWB.html +++ b/docs/reference/FCWB.html @@ -67,7 +67,7 @@ nat.flybrains - 1.7.2 + 1.7.3 @@ -186,7 +186,7 @@

Contents

-

Site built with pkgdown 1.2.0.

+

Site built with pkgdown 1.3.0.

diff --git a/docs/reference/FCWBNP.surf.html b/docs/reference/FCWBNP.surf.html index 6f02c86..f9d2875 100644 --- a/docs/reference/FCWBNP.surf.html +++ b/docs/reference/FCWBNP.surf.html @@ -66,7 +66,7 @@ nat.flybrains - 1.7.2 + 1.7.3 @@ -160,7 +160,7 @@

Contents

-

Site built with pkgdown 1.2.0.

+

Site built with pkgdown 1.3.0.

diff --git a/docs/reference/IBN.html b/docs/reference/IBN.html index 28dc362..c313aee 100644 --- a/docs/reference/IBN.html +++ b/docs/reference/IBN.html @@ -64,7 +64,7 @@ nat.flybrains - 1.7.2 + 1.7.3 @@ -203,7 +203,7 @@

Contents

-

Site built with pkgdown 1.2.0.

+

Site built with pkgdown 1.3.0.

diff --git a/docs/reference/IBNWB.html b/docs/reference/IBNWB.html index 2ae34a6..2a945a4 100644 --- a/docs/reference/IBNWB.html +++ b/docs/reference/IBNWB.html @@ -70,7 +70,7 @@ nat.flybrains - 1.7.2 + 1.7.3 @@ -193,7 +193,7 @@

Contents

-

Site built with pkgdown 1.2.0.

+

Site built with pkgdown 1.3.0.

diff --git a/docs/reference/IS2.html b/docs/reference/IS2.html index 3090e14..f91089b 100644 --- a/docs/reference/IS2.html +++ b/docs/reference/IS2.html @@ -63,7 +63,7 @@ nat.flybrains - 1.7.2 + 1.7.3 @@ -164,7 +164,7 @@

Contents

-

Site built with pkgdown 1.2.0.

+

Site built with pkgdown 1.3.0.

diff --git a/docs/reference/IS2.surf.html b/docs/reference/IS2.surf.html index 838a91a..e8a9967 100644 --- a/docs/reference/IS2.surf.html +++ b/docs/reference/IS2.surf.html @@ -63,7 +63,7 @@ nat.flybrains - 1.7.2 + 1.7.3 @@ -146,7 +146,7 @@

Contents

-

Site built with pkgdown 1.2.0.

+

Site built with pkgdown 1.3.0.

diff --git a/docs/reference/IS2NP.surf.html b/docs/reference/IS2NP.surf.html index 5ae4944..028af6f 100644 --- a/docs/reference/IS2NP.surf.html +++ b/docs/reference/IS2NP.surf.html @@ -66,7 +66,7 @@ nat.flybrains - 1.7.2 + 1.7.3 @@ -154,7 +154,7 @@

Contents

-

Site built with pkgdown 1.2.0.

+

Site built with pkgdown 1.3.0.

diff --git a/docs/reference/JFRC2.html b/docs/reference/JFRC2.html index ea94604..5078f9f 100644 --- a/docs/reference/JFRC2.html +++ b/docs/reference/JFRC2.html @@ -70,7 +70,7 @@ nat.flybrains - 1.7.2 + 1.7.3 @@ -190,7 +190,7 @@

Contents

-

Site built with pkgdown 1.2.0.

+

Site built with pkgdown 1.3.0.

diff --git a/docs/reference/JFRC2013.html b/docs/reference/JFRC2013.html index 5ead8d0..322ae2a 100644 --- a/docs/reference/JFRC2013.html +++ b/docs/reference/JFRC2013.html @@ -75,7 +75,7 @@ nat.flybrains - 1.7.2 + 1.7.3 @@ -232,7 +232,7 @@

Contents

-

Site built with pkgdown 1.2.0.

+

Site built with pkgdown 1.3.0.

diff --git a/docs/reference/JFRC2NP.surf.html b/docs/reference/JFRC2NP.surf.html index 64714b9..9461344 100644 --- a/docs/reference/JFRC2NP.surf.html +++ b/docs/reference/JFRC2NP.surf.html @@ -66,7 +66,7 @@ nat.flybrains - 1.7.2 + 1.7.3 @@ -247,11 +247,11 @@

Examp # now make that into a tidy data.frame and plot df=data.frame(key=colnames(vs), t(vs), region=sub("_[LR]", "", colnames(vs)), - side=str_match(colnames(vs), "_([LR])")[,2]) + side=str_match(colnames(vs), "_([LR])")[,2]) df2=gather(df, measure, value, volume:surfaceArea) library(ggplot2) - qplot( value, region, data=df2, col=side, facets = . ~ measure) + scale_x_log10() + qplot( value, region, data=df2, col=side, facets = . ~ measure) + scale_x_log10() } @@ -279,7 +279,7 @@

Contents

-

Site built with pkgdown 1.2.0.

+

Site built with pkgdown 1.3.0.

diff --git a/docs/reference/JRC2018F.html b/docs/reference/JRC2018F.html index 86263d8..5f38da9 100644 --- a/docs/reference/JRC2018F.html +++ b/docs/reference/JRC2018F.html @@ -67,7 +67,7 @@ nat.flybrains - 1.7.2 + 1.7.3 @@ -148,7 +148,7 @@

Examp #> attr(,"class") #> [1] "boundingbox"
JRC2018F
#> === Template Brain === #> Name: JRC2018F -#> Short Name: JRC2018_FEMALE_38um_iso_16bit +#> Short Name: JRC2018F #> Type: Average template brain #> Sex: F #> Dimensions:1652 x 768 x 479 voxels @@ -190,7 +190,7 @@

Contents

-

Site built with pkgdown 1.2.0.

+

Site built with pkgdown 1.3.0.

diff --git a/docs/reference/T1.html b/docs/reference/T1.html index 2f69850..c1897af 100644 --- a/docs/reference/T1.html +++ b/docs/reference/T1.html @@ -65,7 +65,7 @@ nat.flybrains - 1.7.2 + 1.7.3 @@ -173,7 +173,7 @@

Contents

-

Site built with pkgdown 1.2.0.

+

Site built with pkgdown 1.3.0.

diff --git a/docs/reference/VNCIS1.html b/docs/reference/VNCIS1.html index a77a23a..2e154db 100644 --- a/docs/reference/VNCIS1.html +++ b/docs/reference/VNCIS1.html @@ -65,7 +65,7 @@ nat.flybrains - 1.7.2 + 1.7.3 @@ -178,7 +178,7 @@

Contents

-

Site built with pkgdown 1.2.0.

+

Site built with pkgdown 1.3.0.

diff --git a/docs/reference/download_jefferislab_registrations.html b/docs/reference/download_jefferislab_registrations.html index 7ec3485..6366fb4 100644 --- a/docs/reference/download_jefferislab_registrations.html +++ b/docs/reference/download_jefferislab_registrations.html @@ -65,7 +65,7 @@ nat.flybrains - 1.7.2 + 1.7.3 @@ -177,7 +177,7 @@

Contents

-

Site built with pkgdown 1.2.0.

+

Site built with pkgdown 1.3.0.

diff --git a/docs/reference/index.html b/docs/reference/index.html index 01867d0..8dffc1e 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -60,7 +60,7 @@ nat.flybrains - 1.7.2 + 1.7.3 @@ -291,7 +291,7 @@

Contents

-

Site built with pkgdown 1.2.0.

+

Site built with pkgdown 1.3.0.

diff --git a/docs/reference/nat.flybrains-package.html b/docs/reference/nat.flybrains-package.html index d43df56..e300635 100644 --- a/docs/reference/nat.flybrains-package.html +++ b/docs/reference/nat.flybrains-package.html @@ -67,7 +67,7 @@ nat.flybrains - 1.7.2 + 1.7.3 @@ -196,7 +196,7 @@

Contents

-

Site built with pkgdown 1.2.0.

+

Site built with pkgdown 1.3.0.