Skip to content

Commit

Permalink
Merge pull request #231 from ropensci/b-ggplot-deprec
Browse files Browse the repository at this point in the history
B ggplot deprec
  • Loading branch information
christophsax authored Oct 20, 2024
2 parents 9ef0c4d + dcf9ab5 commit 0a80208
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 13 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: tsbox
Type: Package
Title: Class-Agnostic Time Series
Version: 0.4.1.9002
Version: 0.4.2
Authors@R: c(
person("Christoph", "Sax", email = "[email protected]", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7192-7044")),
person("Cathy", "Chamberlin", role = c("rev")),
Expand Down Expand Up @@ -43,7 +43,7 @@ Encoding: UTF-8
URL: https://docs.ropensci.org/tsbox/, https://github.com/ropensci/tsbox
BugReports: https://github.com/ropensci/tsbox/issues
Roxygen: list(markdown = TRUE, roclets = c ("namespace", "rd", "srr::srr_stats_roclet"))
RoxygenNote: 7.2.3
RoxygenNote: 7.3.2
VignetteBuilder: knitr
Depends:
R (>= 2.10)
Expand Down
6 changes: 5 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# tsbox 0.4.1.9001
# tsbox 0.4.2

## Bug fixes

- ts_ggplot: pass symbols, not strings (fix #223)
- scale_color_tsbox / scale_fill_tsbox: deprecated ds argument
- dectime_to_POSIXct(): fix calc and rounding of seconds (#228) Thanks Miguel!


# tsbox 0.4.1 (2023-05-06)
Expand Down
10 changes: 4 additions & 6 deletions R/ts_ggplot.R
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,8 @@ colors_tsbox <- function() {
scale_color_tsbox <- function(...) {
stopifnot(requireNamespace("ggplot2"))
ggplot2::discrete_scale(
"colour",
"ds",
scales::manual_pal(colors_tsbox()),
aesthetics = "colour",
palette = scales::manual_pal(colors_tsbox()),
...
)
}
Expand All @@ -188,9 +187,8 @@ scale_color_tsbox <- function(...) {
scale_fill_tsbox <- function(...) {
stopifnot(requireNamespace("ggplot2"))
ggplot2::discrete_scale(
"fill",
"ds",
scales::manual_pal(colors_tsbox()),
aesthetics = "fill",
palette = scales::manual_pal(colors_tsbox()),
...
)
}
4 changes: 1 addition & 3 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,4 @@ ts_plot(ts_scale(ts_c(mdeaths, austres, AirPassengers, DAX = EuStockMarkets[ ,'D

### Cheatsheet

<a href="https://www.cynkra.com/blog/2019-04-10-tsbox-01/tsbox-cheatsheet.pdf"><img style="max-width:50%;" src="https://www.cynkra.com/blog/2019-04-10-tsbox-01/tsbox-cheatsheet-small.jpg"></a>


<a href="https://blog.cynkra.com/posts/2019-04-10-tsbox-01/tsbox-cheatsheet.pdf"><img style="max-width:50%;" src="https://blog.cynkra.com/posts/2019-04-10-tsbox-01/tsbox-cheatsheet-small.jpg"></a>
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,4 @@ be. And we finally get a legend!

### Cheatsheet

<a href="https://www.cynkra.com/blog/2019-04-10-tsbox-01/tsbox-cheatsheet.pdf"><img style="max-width:50%;" src="https://www.cynkra.com/blog/2019-04-10-tsbox-01/tsbox-cheatsheet-small.jpg"></a>
<a href="https://blog.cynkra.com/posts/2019-04-10-tsbox-01/tsbox-cheatsheet.pdf"><img style="max-width:50%;" src="https://blog.cynkra.com/posts/2019-04-10-tsbox-01/tsbox-cheatsheet-small.jpg"></a>
9 changes: 9 additions & 0 deletions man/tsbox-package.Rd

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

0 comments on commit 0a80208

Please sign in to comment.