v.1.6.3

Author: helgasoft

.Rbuildignore

@@ -22,3 +22,4 @@ README.md
 ^\.ccache$
 ^tic\.R$
 ^codecov\.yml$
+cleanup.bat

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: echarty
 Title: Minimal R/Shiny Interface to JavaScript Library 'ECharts'
-Date: 2023-12-19
-Version: 1.6.2.02
+Date: 2024-01-10
+Version: 1.6.3
 Author: Larry Helgason, with initial code from John Coene's library echarts4r
 Maintainer: Larry Helgason <larry@helgasoft.com>
 Description: Deliver the full functionality of 'ECharts' with minimal overhead. 'echarty' users build R lists for 'ECharts' API. Lean set of powerful commands.

NEWS.md

@@ -1,6 +1,6 @@
 # history of package _echarty_
 
-## v.1.6.2.02  latest, in development
+## v.1.6.3
 
 - added coder.R demo
 - correct gridIndex numbering for xAxis/yAxis

R/echarty.R

@@ -352,6 +352,8 @@ ec.init <- function( df= NULL, preset= TRUE, ctype= 'scatter', ...,
         pos <- which(colnames(df)==grnm)
         if (!is.null(tl.series) && !is.null(tl.series$groupBy))
           pos <- c(pos, which(colnames(df)==tl.series$groupBy))
+        if (!is.null(series.param) && !is.null(series.param$groupBy))
+          pos <- c(pos, which(colnames(df)==series.param$groupBy))
         allp <- rep(TRUE, length(colnames(df)))
         allp <- replace(allp, pos, FALSE)
         colX <- which(allp==TRUE)[1]   # first two==TRUE are X,Y
@@ -625,14 +627,15 @@ ec.init <- function( df= NULL, preset= TRUE, ctype= 'scatter', ...,
 
   # ------------- timeline  -----------------
   if (is.null(tl.series) && is.null(opt1$timeline)) return(wt)
+  if (!preset) return(wt)
   # timeline is evaluated last
   if (is.null(tl.series) && 
       !is.null(opt1$timeline) && 
       !is.null(series.param))
     tl.series <- series.param
 
   if (is.null(df) || !is.grouped_df(df))
-    stop('ec.init: tl.series requires a grouped data.frame df')
+      stop('ec.init: tl.series requires a grouped data.frame df')
 
   if (is.null(tl.series$encode))
     tl.series$encode <- list(x=1, y=2, z=3)  # set default for non-map series

R/examples.R

@@ -86,8 +86,8 @@
 #'   dim = runif(3, 1, 100),
 #'   nam = c('Brazil','China','India')
 #' )
-#' cns |> group_by(nam) |> ec.init(load= 'world',
-#'   tl.series= list(type='map', 
+#' cns |> group_by(nam) |> ec.init(load= 'world', timeline= list(s=TRUE),
+#'   series.param= list(type='map', 
 #'       encode=list(value='val', name='nam')),
 #'   toolbox= list(feature= list(restore= list())),
 #'   visualMap= list(calculable=TRUE, dimension=2)
@@ -282,10 +282,14 @@
 #'   xAxis= list(type= 'category', name= 'tree'),
 #'   yAxis= list(max= max(Orange$circumference)),
 #'   timeline= list(autoPlay= TRUE),
-#'   tl.series= list(type= 'bar', encode= list(x='Tree', y='circumference'))
+#'   series.param= list(type= 'bar', encode= list(x='Tree', y='circumference'))
 #' ) |> ec.upd({
 #'   options <- lapply(options,
-#'      function(o) { o$title$text <- paste('age',o$title$text,'days'); o })
+#'      function(o) {
+#'        vv <- o$series[[1]]$datasetIndex +1;
+#'        vv <- dataset[[vv]]$transform$config[["="]]
+#'        o$title$text <- paste('age',vv,'days'); 
+#'        o })
 #' })
 #' 
 #' 
@@ -298,12 +302,12 @@
 #'   color= c("blue","purple","red","gold","blue","purple","red","gold")
 #' )
 #' df |> group_by(group) |> ec.init( 
-#'      preset= FALSE,
-#'      legend= list(selectedMode= "single"),
-#'      tl.series= list(type= 'pie', roseType= 'radius',
-#'                      itemStyle= list(color=ec.clmn(5)), 
-#'                      label= list(formatter=ec.clmn(4)),
-#'                      encode=list(value='value', itemName='type'))
+#'      preset= FALSE, legend= list(selectedMode= "single"),
+#'      timeline= list(show=TRUE),
+#'      series.param= list(type= 'pie', roseType= 'radius',
+#'        itemStyle= list(color=ec.clmn(5)), 
+#'        label= list(formatter=ec.clmn(4)),
+#'        encode=list(value='value', itemName='type'))
 #' )
 #'
 #'

R/util.R

@@ -35,7 +35,7 @@
 #' \verb{   }... - optional custom series attributes like _itemStyle_\cr
 #' \verb{   }ppfill - optional fill color like '#F00', OR NULL for no-fill, for all Points and Polygons\cr
 #' \verb{   }nid - optional feature property for item name used in tooltips\cr
-#' \verb{   }optional geoJSON _feature properties_: color, ppfill, lwidth, ldash, radius(for points)\cr
+#' \verb{   }optional geoJson _feature properties_: color, ppfill, lwidth, ldash, radius(for points)\cr
 #' **cmd = 'layout'** \cr
 #' \verb{   }multiple charts in table-like rows/columns format\cr
 #' \verb{   }... - List of charts\cr

README.md

@@ -85,9 +85,9 @@ iris |> group_by(Species) |> ec.init(load= '3D')
 iris |> group_by(Species) |> 
 ec.init(
   timeline= list(autoPlay= TRUE),
-  tl.series= list(
-    symbolSize= ec.clmn('Petal.Width', scale= 3),
-    encode= list(y= c('Sepal.Width', 'Petal.Length')),
+  series.param = list(
+    symbolSize= ec.clmn('Petal.Width', scale= 9),
+    encode= list(x= 'Sepal.Width', y='Petal.Length'),
     markLine= list(data= list(list(type='max'), list(type='min')))
   )
 )
@@ -99,12 +99,12 @@ echarty::ec.fromJson('https://helgasoft.github.io/echarty/test/pfull.json')
 
 ## Get started
 
+The Coder is a good introduction, type ```library(echarty); demo(coder)```.  
 The [**WEBSITE**](https://helgasoft.github.io/echarty) has a gallery with code and tutorials.  
-<br /> The package has plenty of [**code
-examples**](https://github.com/helgasoft/echarty/blob/main/R/examples.R)
+The package itself has plenty of [**code examples**](https://github.com/helgasoft/echarty/blob/main/R/examples.R)
 included. Type
 **?ec.examples**, then copy/paste any code to
-see the result.  
+see the chart.  
 
 Now you can start building [**beautiful
 ECharts**](https://echarts.apache.org/examples/en/index.html) (and

man/ec.examples.Rd

@@ -56,7 +56,7 @@ test_that("ec.init presets for timeline", {
   )
   barTL <- function(data, timeline_var) {  #}, x_var, bar_var) {
     bt <- data |> dplyr::group_by(!!dplyr::sym(timeline_var)) |> 
-      ec.init(tl.series = list(type='bar'), #,encode=list(x=x_var, y=bar_var)),
+      ec.init(series.param = list(type='bar'), #,encode=list(x=x_var, y=bar_var)),
               xAxis= list(name='xval'),
               timeline= list(s=T) # data= c(1,2,3,4), axisType='value') #ok
       )
@@ -92,12 +92,12 @@ test_that("ec.init presets for timeline groupBy", {
   expect_equal(p$x$opts$options[[4]]$series[[1]]$encode$y, 'y')
   expect_equal(p$x$opts$yAxis$name, 'y')
 
-  p <- dat |> group_by(x1) |> ec.init(preset=F,  #load='3D',
+  p <- dat |> group_by(x1) |> ec.init(#load='3D',
     xAxis3D=list(s=T),yAxis3D=list(s=T),zAxis3D=list(s=T),grid3D=list(s=T),
-    legend= list(show=TRUE),
-    tl.series= list(encode= list(x='x', y='y', z='z'), type='scatter3D',
-                    symbolSize= ec.clmn('x4', scale=30),
-                    groupBy= 'x2')
+    timeline=list(s=T), legend= list(show=TRUE), 
+    series.param= list(type='scatter3D', groupBy= 'x2',
+      encode= list(x='x', y='y', z='z'), 
+      symbolSize= ec.clmn('x4', scale=30) )
   )
   expect_equal(p$x$opts$options[[1]]$series[[1]]$coordinateSystem, 'cartesian3D')
   expect_equal(length(p$x$opts$options[[1]]$series), 2)