Skip to content

Commit 0a80208

Browse files
authored
Merge pull request #231 from ropensci/b-ggplot-deprec
B ggplot deprec
2 parents 9ef0c4d + dcf9ab5 commit 0a80208

File tree

6 files changed

+22
-13
lines changed

6 files changed

+22
-13
lines changed

‎DESCRIPTION‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: tsbox
22
Type: Package
33
Title: Class-Agnostic Time Series
4-
Version: 0.4.1.9002
4+
Version: 0.4.2
55
Authors@R: c(
66
person("Christoph", "Sax", email = "[email protected]", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7192-7044")),
77
person("Cathy", "Chamberlin", role = c("rev")),
@@ -43,7 +43,7 @@ Encoding: UTF-8
4343
URL: https://docs.ropensci.org/tsbox/, https://github.com/ropensci/tsbox
4444
BugReports: https://github.com/ropensci/tsbox/issues
4545
Roxygen: list(markdown = TRUE, roclets = c ("namespace", "rd", "srr::srr_stats_roclet"))
46-
RoxygenNote: 7.2.3
46+
RoxygenNote: 7.3.2
4747
VignetteBuilder: knitr
4848
Depends:
4949
R (>= 2.10)

‎NEWS.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
# tsbox 0.4.1.9001
1+
# tsbox 0.4.2
2+
3+
## Bug fixes
24

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

59

610
# tsbox 0.4.1 (2023-05-06)

‎R/ts_ggplot.R‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,8 @@ colors_tsbox <- function() {
176176
scale_color_tsbox <- function(...) {
177177
stopifnot(requireNamespace("ggplot2"))
178178
ggplot2::discrete_scale(
179-
"colour",
180-
"ds",
181-
scales::manual_pal(colors_tsbox()),
179+
aesthetics = "colour",
180+
palette = scales::manual_pal(colors_tsbox()),
182181
...
183182
)
184183
}
@@ -188,9 +187,8 @@ scale_color_tsbox <- function(...) {
188187
scale_fill_tsbox <- function(...) {
189188
stopifnot(requireNamespace("ggplot2"))
190189
ggplot2::discrete_scale(
191-
"fill",
192-
"ds",
193-
scales::manual_pal(colors_tsbox()),
190+
aesthetics = "fill",
191+
palette = scales::manual_pal(colors_tsbox()),
194192
...
195193
)
196194
}

‎README.Rmd‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,4 @@ ts_plot(ts_scale(ts_c(mdeaths, austres, AirPassengers, DAX = EuStockMarkets[ ,'D
116116

117117
### Cheatsheet
118118

119-
<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>
120-
121-
119+
<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>

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,4 +108,4 @@ be. And we finally get a legend!
108108

109109
### Cheatsheet
110110

111-
<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>
111+
<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>

‎man/tsbox-package.Rd‎

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)