diff --git a/NEWS.md b/NEWS.md index 8391cdc..4d0adcb 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,6 @@ # jskm 0.5.3 -* Update: Add theme('jama','nejmoa') to `jskm` and `svyjskm` +* Update: Add theme('JAMA','NEJM') to `jskm` and `svyjskm` # jskm 0.5.2 diff --git a/README.Rmd b/README.Rmd index 5309017..b1a433a 100644 --- a/README.Rmd +++ b/README.Rmd @@ -77,13 +77,15 @@ jskm(fit2, mark = F, surv.scale = "percent", table = T, status.cmprsk = "1") jskm(fit2, mark = F, surv.scale = "percent", table = T, status.cmprsk = "1", showpercent = T, cut.landmark = 500) ``` -### Theme Jama +### Theme + +#### JAMA ```{r} jskm(fit, theme='jama', cumhaz = T, table=T, mark = F, ylab = "Cumulative incidence (%)", surv.scale = "percent", pval =T, pval.size = 6, pval.coord = c(300, 0.7)) ``` -### Theme Nejmoa +#### NEJM ```{r} jskm(fit, theme='nejm', nejm.infigure.ratiow = 0.6, nejm.infigure.ratioh = 0.4, nejm.infigure.ylim = c(0,0.7), cumhaz = T, table=T, mark = F, ylab = "Cumulative incidence (%)", surv.scale = "percent", pval =T, pval.size = 6, pval.coord = c(300, 0.7)) @@ -117,13 +119,14 @@ svyjskm(s3, ci = F) svyjskm(s3, ci = F, surv.scale = "percent", pval = T, table = T, cut.landmark = 1000, showpercent = T) ``` -### Theme jama +### Theme +#### JAMA ```{r} svyjskm(s2, theme='jama', pval = T, table = T, design = dpbc) ``` -### Theme nejmoa +#### NEJM ```{r} svyjskm(s2, theme='nejm', nejm.infigure.ratiow = 0.4, nejm.infigure.ratioh = 0.4, nejm.infigure.ylim = c(0.2,1), pval = T, table = T, design = dpbc) diff --git a/README.md b/README.md index bc93c00..41f6ddb 100644 --- a/README.md +++ b/README.md @@ -99,7 +99,9 @@ jskm(fit2, mark = F, surv.scale = "percent", table = T, status.cmprsk = "1", sho ![](man/figures/README-unnamed-chunk-4-2.png) -### Theme Jama +### Theme + +#### JAMA ``` r jskm(fit, theme='jama', cumhaz = T, table=T, mark = F, ylab = "Cumulative incidence (%)", surv.scale = "percent", pval =T, pval.size = 6, pval.coord = c(300, 0.7)) @@ -107,7 +109,7 @@ jskm(fit, theme='jama', cumhaz = T, table=T, mark = F, ylab = "Cumulative incide ![](man/figures/README-unnamed-chunk-5-1.png) -### Theme Nejmoa +#### NEJM ``` r jskm(fit, theme='nejm', nejm.infigure.ratiow = 0.6, nejm.infigure.ratioh = 0.4, nejm.infigure.ylim = c(0,0.7), cumhaz = T, table=T, mark = F, ylab = "Cumulative incidence (%)", surv.scale = "percent", pval =T, pval.size = 6, pval.coord = c(300, 0.7)) @@ -168,7 +170,9 @@ svyjskm(s3, ci = F, surv.scale = "percent", pval = T, table = T, cut.landmark = ![](man/figures/README-unnamed-chunk-8-3.png) -### Theme jama +### Theme + +#### JAMA ``` r svyjskm(s2, theme='jama', pval = T, table = T, design = dpbc) @@ -176,7 +180,7 @@ svyjskm(s2, theme='jama', pval = T, table = T, design = dpbc) ![](man/figures/README-unnamed-chunk-9-1.png) -### Theme nejmoa +#### NEJM ``` r svyjskm(s2, theme='nejm', nejm.infigure.ratiow = 0.4, nejm.infigure.ratioh = 0.4, nejm.infigure.ylim = c(0.2,1), pval = T, table = T, design = dpbc) diff --git a/man/figures/README-unnamed-chunk-1-2.png b/man/figures/README-unnamed-chunk-1-2.png index 088235a..a4056a9 100644 Binary files a/man/figures/README-unnamed-chunk-1-2.png and b/man/figures/README-unnamed-chunk-1-2.png differ diff --git a/man/figures/README-unnamed-chunk-10-1.png b/man/figures/README-unnamed-chunk-10-1.png index 05ae26c..d23532c 100644 Binary files a/man/figures/README-unnamed-chunk-10-1.png and b/man/figures/README-unnamed-chunk-10-1.png differ diff --git a/man/figures/README-unnamed-chunk-3-1.png b/man/figures/README-unnamed-chunk-3-1.png index 651d0d3..6e566b6 100644 Binary files a/man/figures/README-unnamed-chunk-3-1.png and b/man/figures/README-unnamed-chunk-3-1.png differ diff --git a/man/figures/README-unnamed-chunk-3-2.png b/man/figures/README-unnamed-chunk-3-2.png index 88fad99..89ec847 100644 Binary files a/man/figures/README-unnamed-chunk-3-2.png and b/man/figures/README-unnamed-chunk-3-2.png differ diff --git a/man/figures/README-unnamed-chunk-3-3.png b/man/figures/README-unnamed-chunk-3-3.png deleted file mode 100644 index a01cab1..0000000 Binary files a/man/figures/README-unnamed-chunk-3-3.png and /dev/null differ diff --git a/man/figures/README-unnamed-chunk-4-1.png b/man/figures/README-unnamed-chunk-4-1.png index 5ae4af9..d11787e 100644 Binary files a/man/figures/README-unnamed-chunk-4-1.png and b/man/figures/README-unnamed-chunk-4-1.png differ diff --git a/man/figures/README-unnamed-chunk-4-2.png b/man/figures/README-unnamed-chunk-4-2.png index 281cb22..3127387 100644 Binary files a/man/figures/README-unnamed-chunk-4-2.png and b/man/figures/README-unnamed-chunk-4-2.png differ diff --git a/man/figures/README-unnamed-chunk-4-3.png b/man/figures/README-unnamed-chunk-4-3.png deleted file mode 100644 index 8e36ec0..0000000 Binary files a/man/figures/README-unnamed-chunk-4-3.png and /dev/null differ diff --git a/man/figures/README-unnamed-chunk-5-1.png b/man/figures/README-unnamed-chunk-5-1.png index e1e7c86..1584e30 100644 Binary files a/man/figures/README-unnamed-chunk-5-1.png and b/man/figures/README-unnamed-chunk-5-1.png differ diff --git a/man/figures/README-unnamed-chunk-5-2.png b/man/figures/README-unnamed-chunk-5-2.png deleted file mode 100644 index d819c41..0000000 Binary files a/man/figures/README-unnamed-chunk-5-2.png and /dev/null differ diff --git a/man/figures/README-unnamed-chunk-5-3.png b/man/figures/README-unnamed-chunk-5-3.png deleted file mode 100644 index ff87dec..0000000 Binary files a/man/figures/README-unnamed-chunk-5-3.png and /dev/null differ diff --git a/man/figures/README-unnamed-chunk-6-1.png b/man/figures/README-unnamed-chunk-6-1.png index e1e7c86..567719f 100644 Binary files a/man/figures/README-unnamed-chunk-6-1.png and b/man/figures/README-unnamed-chunk-6-1.png differ diff --git a/man/figures/README-unnamed-chunk-6-2.png b/man/figures/README-unnamed-chunk-6-2.png deleted file mode 100644 index c876795..0000000 Binary files a/man/figures/README-unnamed-chunk-6-2.png and /dev/null differ diff --git a/man/figures/README-unnamed-chunk-6-3.png b/man/figures/README-unnamed-chunk-6-3.png deleted file mode 100644 index 9f478a8..0000000 Binary files a/man/figures/README-unnamed-chunk-6-3.png and /dev/null differ diff --git a/man/figures/README-unnamed-chunk-7-2.png b/man/figures/README-unnamed-chunk-7-2.png index 05ae26c..b080e9e 100644 Binary files a/man/figures/README-unnamed-chunk-7-2.png and b/man/figures/README-unnamed-chunk-7-2.png differ diff --git a/man/figures/README-unnamed-chunk-8-3.png b/man/figures/README-unnamed-chunk-8-3.png index 7a816f2..7d2477d 100644 Binary files a/man/figures/README-unnamed-chunk-8-3.png and b/man/figures/README-unnamed-chunk-8-3.png differ diff --git a/man/figures/README-unnamed-chunk-9-1.png b/man/figures/README-unnamed-chunk-9-1.png index 05ae26c..37b0d8b 100644 Binary files a/man/figures/README-unnamed-chunk-9-1.png and b/man/figures/README-unnamed-chunk-9-1.png differ diff --git a/man/figures/README-unnamed-chunk-9-2.png b/man/figures/README-unnamed-chunk-9-2.png deleted file mode 100644 index 3ffb0d6..0000000 Binary files a/man/figures/README-unnamed-chunk-9-2.png and /dev/null differ diff --git a/man/figures/README-unnamed-chunk-9-3.png b/man/figures/README-unnamed-chunk-9-3.png deleted file mode 100644 index 7a816f2..0000000 Binary files a/man/figures/README-unnamed-chunk-9-3.png and /dev/null differ diff --git a/vignettes/jskm.Rmd b/vignettes/jskm.Rmd index 0caaef0..6ee2a3d 100644 --- a/vignettes/jskm.Rmd +++ b/vignettes/jskm.Rmd @@ -110,13 +110,15 @@ svyjskm(s3, ci = F, showpercent = T) svyjskm(s3, ci = F, surv.scale = "percent", pval = T, table = T, cut.landmark = 1000) ``` -### Theme jama +### Theme + +#### JAMA ```{r} svyjskm(s2, theme='jama', pval = T, table = T, design = dpbc) ``` -### Theme nejmoa +#### NEJM ```{r} svyjskm(s2, theme='nejm', nejm.infigure.ratiow = 0.4, nejm.infigure.ratioh = 0.4, nejm.infigure.ylim = c(0.2,1), pval = T, table = T, design = dpbc)