Skip to content

Commit

Permalink
Merge pull request #294 from ldecicco-USGS/master
Browse files Browse the repository at this point in the history
Getting proper citation up to GRAN
  • Loading branch information
ldecicco-USGS authored Sep 5, 2018
2 parents 7eb6e04 + 4f1075b commit b3d0f84
Show file tree
Hide file tree
Showing 171 changed files with 65 additions and 53 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: toxEval
Type: Package
Title: ToxCast Evaluations
Version: 1.0.0
Date: 2018-07-31
Version: 1.0.1
Date: 2018-09-05
Authors@R: c(person("Laura", "DeCicco",
role = c("aut","cre"),
email = "[email protected]"),
Expand Down
5 changes: 3 additions & 2 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,9 @@ plot_stacks <- plot_tox_stacks(chemicalSummary,
plot_stacks
######################################
plot_heat <- plot_tox_heatmap(chemicalSummary,
tox_list$chem_site,
category = "Chemical")
tox_list$chem_site,
category = "Chemical Class",
font_size = 7)
plot_heat
```

Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,9 @@ plot_stacks
``` r
######################################
plot_heat <- plot_tox_heatmap(chemicalSummary,
tox_list$chem_site,
category = "Chemical")
tox_list$chem_site,
category = "Chemical Class",
font_size = 7)
plot_heat
```

Expand Down
2 changes: 1 addition & 1 deletion docs/CONDUCT.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/DISCLAIMER.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/articles/Introduction.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/articles/PrepareData.html

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

6 changes: 3 additions & 3 deletions docs/articles/basicWorkflow.html

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

Binary file modified docs/articles/basicWorkflow_files/figure-html/boxDetails-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/articles/basicWorkflow_files/figure-html/boxplots1-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/articles/basicWorkflow_files/figure-html/endpoints-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/articles/basicWorkflow_files/figure-html/heat-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/articles/basicWorkflow_files/figure-html/maumeePlot-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/articles/basicWorkflow_files/figure-html/siteStacks-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/articles/basicWorkflow_files/figure-html/stackplots1-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -1287,10 +1287,18 @@ function mouseHandler(mapId, layerId, group, eventName, extraInfo) {
return function (e) {
if (!_htmlwidgets2.default.shinyMode) return;

var latLng = e.target.getLatLng ? e.target.getLatLng() : e.latlng;
if (latLng) {
// retrieve only lat, lon values to remove prototype
// and extra parameters added by 3rd party modules
// these objects are for json serialization, not javascript
var latLngVal = _leaflet2.default.latLng(latLng); // make sure it has consistent shape
latLng = { lat: latLngVal.lat, lng: latLngVal.lng };
}
var eventInfo = _jquery2.default.extend({
id: layerId,
".nonce": Math.random() // force reactivity
}, group !== null ? { group: group } : null, e.target.getLatLng ? e.target.getLatLng() : e.latlng, extraInfo);
}, group !== null ? { group: group } : null, latLng, extraInfo);

_shiny2.default.onInputChange(mapId + "_" + eventName, eventInfo);
};
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
2 changes: 1 addition & 1 deletion docs/articles/index.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/articles/shinyApp.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/authors.html

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

Binary file modified docs/favicon.ico
Binary file not shown.
7 changes: 4 additions & 3 deletions docs/index.html

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

Binary file modified docs/logo.png
2 changes: 1 addition & 1 deletion docs/reference/ToxCast_ACC.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/clean_endPoint_info.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/createLink.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/create_toxEval.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/end_point_info.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/endpoint_hits_DT.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/explore_endpoints.html

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

Binary file modified docs/reference/figures/logo.png
Binary file added docs/reference/figures/toxEval.png
Binary file modified docs/reference/figures/unnamed-chunk-4-1.png
Binary file modified docs/reference/figures/unnamed-chunk-4-2.png
Binary file modified docs/reference/figures/unnamed-chunk-4-3.png
2 changes: 1 addition & 1 deletion docs/reference/filter_groups.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/get_ACC.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/get_chemical_summary.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/hits_by_groupings_DT.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/hits_summary_DT.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.

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

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

Binary file modified docs/reference/plot_tox_boxplots-1.png
Binary file modified docs/reference/plot_tox_boxplots-2.png
Binary file modified docs/reference/plot_tox_boxplots-3.png
Binary file modified docs/reference/plot_tox_boxplots-4.png
2 changes: 1 addition & 1 deletion docs/reference/plot_tox_boxplots.html

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

Binary file modified docs/reference/plot_tox_endpoints-1.png
Binary file modified docs/reference/plot_tox_endpoints-2.png
Binary file modified docs/reference/plot_tox_endpoints-3.png
2 changes: 1 addition & 1 deletion docs/reference/plot_tox_endpoints.html

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

Binary file modified docs/reference/plot_tox_heatmap-1.png
Binary file modified docs/reference/plot_tox_heatmap-2.png
Binary file modified docs/reference/plot_tox_heatmap-3.png
2 changes: 1 addition & 1 deletion docs/reference/plot_tox_heatmap.html

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

Binary file modified docs/reference/plot_tox_stacks-1.png
Binary file modified docs/reference/plot_tox_stacks-2.png
Binary file modified docs/reference/plot_tox_stacks-3.png
2 changes: 1 addition & 1 deletion docs/reference/plot_tox_stacks.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/rank_sites_DT.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/remove_flags.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/summary.toxEval.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/toxEval-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/tox_chemicals.html

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

Loading

0 comments on commit b3d0f84

Please sign in to comment.