v 1.43.7 released to cran (#133)

cb4ds · May 13, 2023 · 71e9ae8 · 71e9ae8
1 parent 50c2f02
commit 71e9ae8
Show file tree

Hide file tree

Showing 11 changed files with 51 additions and 14 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,5 +1,5 @@
 Package: canvasXpress
-Version: 1.42.9
+Version: 1.43.7
 Title: Visualization Package for CanvasXpress in R
 Description: Enables creation of visualizations using the CanvasXpress framework
     in R. CanvasXpress is a standalone JavaScript library for reproducible research

diff --git a/NEWS.md b/NEWS.md
@@ -1,11 +1,18 @@
 # R Package NEWS
 
+
 This file details changes to the canvasXpress R package only - for detailed 
 information on changes to the stand-alone JavaScript CanvasXpress library see the 
 <a href="https://www.canvasxpress.org"> main website</a>.
 
+
 ---
 
+
+## v1.43.7
+* Updated CanvasXpress JS and CSS libraries to v43.7
+* Updated ggplot conversion functionality to allow configuration changes
+
 ## v1.42.9
 * Updated CanvasXpress JS and CSS libraries to v42.9
 * Updated htmlwidgets functionality to avoid a resizing issue in shiny applications

diff --git a/R/canvasXpress.R b/R/canvasXpress.R
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ as well as the zooming, panning and drag-and-drop capabilities are features that
 class.
 
 ***canvasXpress*** can be now simply used within R at the console to generate conventional plots, in R-Studio
-or seamlessly embedded in [Shiny](https://shiny.rstudio.com) web applications. Full-fledged examples of the ***canvasXpress*** library including the mouse events, zooming, and broadcasting capabilities are included in this package in several examples that can be accessed using the cxShinyExample function.  This ***canvasXpress*** R library was created with the [htmlwidgets](https://github.com/ramnathv/htmlwidgets) package.
+or seamlessly embedded in [Shiny](https://shiny.posit.co) web applications. Full-fledged examples of the ***canvasXpress*** library including the mouse events, zooming, and broadcasting capabilities are included in this package in several examples that can be accessed using the cxShinyExample function.  This ***canvasXpress*** R library was created with the [htmlwidgets](https://github.com/ramnathv/htmlwidgets) package.
 
 ### Installation
 

diff --git a/cran-comments.md b/cran-comments.md
@@ -1,10 +1,14 @@
 ## Comments from Maintainer
 
+
 Resubmission:
-* Badge link URL updated twice, first to solve the 500 and then to solve the 301 (which is invisible in the browser) - apologies!
 
-* Updated JS underlying library
-* Fixed some misc. bugs with htmlwidgets interaction as well as added ggplot functionality for conversions
+* markdown for the news failed due to missing line return on windows  
+
+Original:
+
+* Updated JS underlying library  
+* Added ggplot functionality for conversions and additional parameters  
 
 ---  
 
@@ -14,8 +18,9 @@ Resubmission:
 RStudio Server Pro (ubuntu 18.04.2)  
 
 * R 4.0.5
-* R 4.1.2
-* R 4.2.2
+* R 4.1.3
+* R 4.2.3
+* R 4.3.0
 
 CircleCI
 

diff --git a/inst/htmlwidgets/canvasXpress.yaml b/inst/htmlwidgets/canvasXpress.yaml
@@ -1,6 +1,6 @@
 dependencies:
   - name: canvasXpress
-    version: 42.9
+    version: 43.7
     src: "htmlwidgets/lib/canvasXpress"
     script: canvasXpress.min.js
     stylesheet: canvasXpress.css
diff --git a/inst/htmlwidgets/lib/canvasXpress/canvasXpress.css b/inst/htmlwidgets/lib/canvasXpress/canvasXpress.css
diff --git a/inst/ui-examples/cX-function.R.gz b/inst/ui-examples/cX-function.R.gz
diff --git a/misc/cX-function.R b/misc/cX-function.R
@@ -305,6 +305,7 @@ cXbar6 <- function() {
     showTransition=FALSE,
     smpLabelRotate=90,
     smpTitle="Species",
+    splitSamplesBy="Species",
     theme="blackAndWhite",
     title="Iris flower data set",
     xAxis2Show=FALSE
@@ -771,6 +772,7 @@ cXboxplot4 <- function() {
     smpTitle="dose",
     smpTitleFontStyle="bold",
     smpTitleScaleFontFactor=1.8,
+    splitSamplesBy="dose",
     theme="CanvasXpress",
     title="The Effect of Vitamin C on Tooth Growth in Guinea Pigs",
     xAxis2Show=FALSE,
@@ -2467,6 +2469,7 @@ cXdotplot8 <- function() {
     smpTitle="dose",
     smpTitleFontStyle="bold",
     smpTitleScaleFontFactor=1.8,
+    splitSamplesBy="dose",
     stringSampleFactors=list("dose"),
     title="The Effect of Vitamin C on Tooth Growth in Guinea Pigs",
     xAxis2Show=FALSE,
@@ -3130,6 +3133,19 @@ cXgenome3 <- function() {
   )
 }
 
+cXgenome4 <- function() {
+  library(canvasXpress)
+  library(jsonlite)
+  genome <- read_json("https://www.canvasxpress.org/data/cX-genomeideogram.json")
+  canvasXpress(
+    data=genome,
+    background="rgb(245,245,245)",
+    graphType="Genome",
+    ideogramShowFullChromosome=TRUE,
+    showIdeogram=TRUE
+  )
+}
+
 cXheatmap1 <- function() {
   library(canvasXpress)
   y=read.table("https://www.canvasxpress.org/data/cX-heatmapR-dat.txt", header=TRUE, sep="\t", quote="", row.names=1, fill=TRUE, check.names=FALSE, stringsAsFactors=FALSE)
@@ -3386,6 +3402,8 @@ cXheatmap12 <- function() {
     smpLabelScaleFontFactor=1.1,
     smpOverlayProperties=list(Binary=list(position="left", scheme="BlackAndWhite", showLegend=TRUE, type="Default"), Boolean=list(position="left"), Continuous=list(position="left", showLegend=TRUE, spectrum=list("green", "white"), type="Heatmap"), Discrete=list(position="left", showLegend=TRUE, thickness=30, type="Default"), Early=list(color="blue", position="right", thickness=50, type="Line"), Late=list(color="red", position="right", thickness=50, type="Line"), OnTime=list(color="green", position="right", thickness=50, type="Line"), PhaseA=list(position="left", showLegend=TRUE, thickness=50, type="Bar"), PhaseB=list(position="left", showLegend=TRUE, thickness=50, type="Bar"), PhaseC=list(position="left", showLegend=TRUE, thickness=50, type="Bar"), Temp=list(position="right", spectrum=list("blue", "white", "red"), thickness=100, type="Heatmap")),
     smpOverlays=list("PhaseA", "PhaseB", "PhaseC", "-", "-", "Binary", "Boolean", "Continuous", "Discrete", "-", "-", "Temp", "-", "-", "Early", "OnTime", "Late"),
+    splitSamplesBy="Discrete",
+    splitVariablesBy="Drug",
     varLabelRotate=45,
     varLabelScaleFontFactor=1.7,
     varOverlayProperties=list(Cold=list(color="blue", position="bottom", showLegend=TRUE, thickness=50, type="StackedPercent"), Conc=list(position="top", showLegend=TRUE, thickness=40, type="Bar"), Desc=list(position="bottom", type="Text"), Drug=list(position="top", showLegend=TRUE, thickness=30, type="Increase"), Even=list(position="bottom", showLegend=TRUE, thickness=50, type="Bar"), Female=list(position="top", showLegend=TRUE, thickness=50, type="Pie"), Hot=list(color="red", position="bottom", showLegend=TRUE, thickness=50, type="StackedPercent"), Male=list(position="top", showLegend=TRUE, thickness=50, type="Pie"), Nice=list(color="green", position="bottom", showLegend=TRUE, thickness=50, type="Dotplot"), Odd=list(position="bottom", showLegend=TRUE, thickness=50, type="BarLine"), Site=list(position="top", showLegend=TRUE, type="Default"), Ugly=list(color="black", position="bottom", showLegend=TRUE, thickness=50, type="Dotplot")),
@@ -3994,7 +4012,7 @@ cXlayout14 <- function() {
     graphOrientation="vertical",
     graphType="Bar",
     layoutAdjust=TRUE,
-    layoutConfig=list(list(axisCoordinate=TRUE, graphType="BarLine", showDataValues=TRUE, xAxis=list("Duration"), xAxis2=list("Discontinued"), xAxisTitle="Duration of Treatment"), list(colorBy="Drug", legendColumns=5, legendInside=TRUE, legendPosition="bottomLeft", showLegend=TRUE, showLegendTitle=FALSE, xAxisTitle="Change from Baseline (%)"), list(barLollipopFactor=1, barLollipopOpen=TRUE, barType="lollipop", xAxisTitle="Baseline (mm)")),
+    layoutConfig=list(list(axisCoordinate=TRUE, graphType="BarLine", showDataValues=TRUE, xAxis=list("Duration"), xAxis2=list("Discontinued"), xAxisTitle="Duration of Treatment"), list(colorBy="Drug", legendColumns=5, legendInside=TRUE, legendPosition="bottomLeft", showLegend=TRUE, showLegendTitle=FALSE, xAxisTitle="Change from Baseline (%)"), list(barLollipopFactor=1.5, barLollipopOpen=FALSE, barType="lollipop", xAxisTitle="Baseline (mm)")),
     layoutLabelShow=FALSE,
     layoutTopology="3X1",
     showLegend=FALSE,
@@ -4122,6 +4140,7 @@ cXline3 <- function() {
     smpLabelRotate=90,
     smpTitle="Collection of Samples",
     smpTitleFontStyle="italic",
+    splitSamplesBy="Factor3",
     theme="blackAndWhite",
     title="Random Data"
   )
@@ -4248,14 +4267,14 @@ cXlollipop1 <- function() {
   y=read.table("https://www.canvasxpress.org/data/cX-lollipop-dat.txt", header=TRUE, sep="\t", quote="", row.names=1, fill=TRUE, check.names=FALSE, stringsAsFactors=FALSE)
   canvasXpress(
     data=y,
-    barLollipopFactor=3,
+    barLollipopFactor=1.8,
     barType="lollipop",
     colorScheme="CanvasXpress",
     graphType="Bar",
     legendKeyBackgroundBorderColor="rgba(255,255,255,0)",
     legendKeyBackgroundColor="rgba(255,255,255,0)",
     showTransition=FALSE,
-    widthFactor=0.1
+    widthFactor=0.6
   )
 }
 
@@ -6260,11 +6279,11 @@ cXstacked4 <- function() {
     graphOrientation="horizontal",
     graphType="Stacked",
     legendBackgroundColor=FALSE,
-    sampleSpaceFactor=1.5,
     showDataValues=TRUE,
     smpLabelScaleFontFactor=0.8,
     smpTitle="Collection of Samples",
     smpTitleFontStyle="italic",
+    splitSamplesBy="Factor3",
     theme="CanvasXpress",
     title="Random Data"
   )
@@ -6971,7 +6990,7 @@ cXtreemap1 <- function() {
     graphType="Treemap",
     objectBorderColor="rgb(0,0,0)",
     showDecorations=FALSE,
-    showTransition=TRUE,
+    showTransition=FALSE,
     theme="CanvasXpress",
     title="Population colored by Gross National Income 2014",
     afterRender=list(list("groupSamples", list("continent")))

diff --git a/tests/testthat/test-ui-genome.R b/tests/testthat/test-ui-genome.R
@@ -18,3 +18,9 @@ test_that("cXgenome3", {
 
     message('These are extremely advanced plots - the R code generated in the on-chart menus will not reproduce the chart directly.')
 })
+
+test_that("cXgenome4", {
+    check_ui_test(cXgenome4())
+
+    message('These are extremely advanced plots - the R code generated in the on-chart menus will not reproduce the chart directly.')
+})
diff --git a/vignettes/getting_started.Rmd b/vignettes/getting_started.Rmd
@@ -23,7 +23,7 @@ be easily sorted, grouped, transposed, transformed or clustered dynamically. The
 as well as the zooming, panning and drag'n drop capabilities are features that make this library unique in its
 class.
 
-***canvasXpress*** can now be used within R at the console to generate conventional plots in R-Studio or seamlessly embedded in [Shiny](https://shiny.rstudio.com) web applications. Full-fledged examples of the ***canvasXpress*** library including the mouse events, zooming, and broadcasting capabilities are included in this package in several examples that can be accessed using the cxShinyExample function.  This ***canvasXpress*** R library was created with the [htmlwidgets](https://github.com/ramnathv/htmlwidgets) package.
+***canvasXpress*** can now be used within R at the console to generate conventional plots in R-Studio or seamlessly embedded in [Shiny](https://shiny.posit.co) web applications. Full-fledged examples of the ***canvasXpress*** library including the mouse events, zooming, and broadcasting capabilities are included in this package in several examples that can be accessed using the cxShinyExample function.  This ***canvasXpress*** R library was created with the [htmlwidgets](https://github.com/ramnathv/htmlwidgets) package.
 
 ## Examples