[rkward-cvs] [rkward] /: rk.plugin.skeleton() will now use the new "new Header()" method by default. tested with the write_csv script.
m.eik michalke
meik.michalke at uni-duesseldorf.de
Thu Dec 4 16:04:13 UTC 2014
Git commit 8965d69842c2b88fb1d824bc6346593bc976b8bd by m.eik michalke.
Committed on 04/12/2014 at 16:02.
Pushed by meikm into branch 'master'.
rk.plugin.skeleton() will now use the new "new Header()" method by default. tested with the write_csv script.
M +3 -1 packages/rkwarddev/ChangeLog
M +1 -1 packages/rkwarddev/DESCRIPTION
M +10 -4 packages/rkwarddev/R/rk.JS.doc.R
M +6 -2 packages/rkwarddev/R/rk.JS.header.R
M +0 -57 packages/rkwarddev/R/rk.JS.scan.R
M +4 -3 packages/rkwarddev/R/rk.plugin.component.R
M +2 -2 packages/rkwarddev/R/rk.plugin.skeleton.R
M +1 -1 packages/rkwarddev/R/rkwarddev-package.R
M +7 -1 packages/rkwarddev/inst/NEWS.Rd
M +12 -3 packages/rkwarddev/man/rk.JS.doc.Rd
M +6 -2 packages/rkwarddev/man/rk.JS.header.Rd
M +3 -3 packages/rkwarddev/man/rk.plugin.component.Rd
M +3 -3 packages/rkwarddev/man/rk.plugin.skeleton.Rd
M +1 -1 packages/rkwarddev/man/rkwarddev-package.Rd
M +6 -6 rkward/plugins/rkwarddev_scripts/write_csv.R
http://commits.kde.org/rkward/8965d69842c2b88fb1d824bc6346593bc976b8bd
diff --git a/packages/rkwarddev/ChangeLog b/packages/rkwarddev/ChangeLog
index dfd74bf..40f489d 100644
--- a/packages/rkwarddev/ChangeLog
+++ b/packages/rkwarddev/ChangeLog
@@ -1,6 +1,6 @@
ChangeLog for package rkwarddev
-changes in version 0.06-6 (2014-12-03)
+changes in version 0.06-6 (2014-12-04)
fixed:
- rk.XML.optionset() does now allow to re-use objects defined in the same
function call (i.e., refer to optioncolumns in the logic section)
@@ -21,6 +21,8 @@ added:
"comment" or "context" to either produce an i18n comment node or an "i18n_context" attribute
- new function rk.i18n.comment() to give context for translators
- new function rk.JS.header() to easily generate JavaScript header code fit for i18n
+ - rk.JS.doc(), rk.plugin.skeleton() and rk.plugin.component() now use rk.JS.header() instead of
+ rk.header(), and also accept its "header.add" attribute
- new function R.comment() to generate JavaScript "comment()" calls
changed:
- function i18n() was changed to be used in JavaScript generation only; this breaks code
diff --git a/packages/rkwarddev/DESCRIPTION b/packages/rkwarddev/DESCRIPTION
index 90ae0ef..0155aa4 100644
--- a/packages/rkwarddev/DESCRIPTION
+++ b/packages/rkwarddev/DESCRIPTION
@@ -15,7 +15,7 @@ URL: http://rkward.sourceforge.net
Authors at R: c(person(given="Meik", family="Michalke",
email="meik.michalke at hhu.de", role=c("aut", "cre")))
Version: 0.06-6
-Date: 2014-12-03
+Date: 2014-12-04
Collate:
'00_class_01_rk.JS.arr.R'
'00_class_02_rk.JS.var.R'
diff --git a/packages/rkwarddev/R/rk.JS.doc.R b/packages/rkwarddev/R/rk.JS.doc.R
index e7e9469..461c0d4 100644
--- a/packages/rkwarddev/R/rk.JS.doc.R
+++ b/packages/rkwarddev/R/rk.JS.doc.R
@@ -28,6 +28,8 @@
#' the function tries to remove duplicate definitions.
#' @param results.header A character string to headline the printed results. Include escapes quotes (\\") if needed.
#' Set to \code{FALSE} or \code{""} if you need more control and want to define the header section in \code{printout}.
+#' @param header.add A named list of additional info to add to the header. Each entry must be named \code{add}
+#' or \code{addFromUI} -- see \code{\link[rkwarddev:rk.JS.header]{rk.JS.header}} for details.
#' @param preprocess A character string to be included in the \code{preprocess()} function. This string will be
#' pasted as-is, after \code{require} has been evaluated.
#' @param calculate A character string to be included in the \code{calculate()} function. This string will be
@@ -43,6 +45,8 @@
#' @param gen.info Logical, if \code{TRUE} a comment note will be written into the document,
#' that it was generated by \code{rkwarddev} and changes should be done to the script.
#' @param indent.by A character string defining how indentation should be done.
+#' @param guess.getter Locigal, if \code{TRUE} try to get a good default getter function for JavaScript
+#' variable values. Only used if \code{header.add} contains XiMpLe nodes.
#' @return A character string.
#' @seealso \code{\link[rkwarddev:rk.paste.JS]{rk.paste.JS}},
#' \code{\link[rkwarddev:rk.JS.vars]{rk.JS.vars}},
@@ -50,11 +54,13 @@
#' \code{\link[rkwarddev:ite]{ite}},
#' \code{\link[rkwarddev:echo]{echo}},
#' \code{\link[rkwarddev:id]{id}},
+#' \code{\link[rkwarddev:rk.JS.header]{rk.JS.header}},
#' and the \href{help:rkwardplugins}{Introduction to Writing Plugins for RKWard}
#' @export
-rk.JS.doc <- function(require=c(), variables=NULL, globals=NULL, results.header=NULL,
- preprocess=NULL, calculate=NULL, printout=NULL, doPrintout=NULL, load.silencer=NULL, gen.info=TRUE, indent.by="\t"){
+rk.JS.doc <- function(require=c(), variables=NULL, globals=NULL, results.header=NULL, header.add=list(),
+ preprocess=NULL, calculate=NULL, printout=NULL, doPrintout=NULL, load.silencer=NULL, gen.info=TRUE, indent.by="\t",
+ guess.getter=FALSE){
# some data transformation
if(inherits(variables, "rk.JS.var")){
@@ -123,7 +129,7 @@ rk.JS.doc <- function(require=c(), variables=NULL, globals=NULL, results.header=
paste0(
indent(2, by=indent.by), "// printout the results\n",
if(is.character(results.header) && !identical(results.header, "")){
- paste0(indent(2, by=indent.by), echo(id("rk.header(", results.header, ")\n")))
+ paste0(indent(2, by=indent.by), rk.JS.header(results.header, guess.getter=guess.getter, .add=header.add))
} else {},
"\n",
ifelse(is.null(printout), echo("rk.print(\"\")\n"), paste0("\n", printout)),
@@ -153,7 +159,7 @@ rk.JS.doc <- function(require=c(), variables=NULL, globals=NULL, results.header=
paste(variables, collapse=""), "\n\n")),
indent(2, by=indent.by), "// create the plot\n",
if(is.character(results.header) && !identical(results.header, "")){
- rk.paste.JS(ite("full", echo(id("rk.header(", results.header,")\n"))))
+ rk.paste.JS(ite("full", rk.JS.header(results.header, guess.getter=guess.getter, .add=header.add)))
} else {},
"\n\n",
doPrintout,
diff --git a/packages/rkwarddev/R/rk.JS.header.R b/packages/rkwarddev/R/rk.JS.header.R
index eea5c80..5098c87 100644
--- a/packages/rkwarddev/R/rk.JS.header.R
+++ b/packages/rkwarddev/R/rk.JS.header.R
@@ -19,7 +19,7 @@
#'
#' @param title Either a character string or object of class \code{rk.JS.i18n}. Will become the header title,
#' nested in an i18n() call.
-#' @param ... An optional number of additional info to add to the header. each entry must be named \code{add}
+#' @param ... An optional number of additional info to add to the header. Each entry must be named \code{add}
#' or \code{addFromUI} -- note that you can use multiple entries with the same name here. Entries named
#' \code{add} must be vectors of legth 2, the first being the caption (character), the second its value (either
#' character or a XiMpLe node from the dialog). Entries named \code{addFromUI} must have exactly one value
@@ -27,15 +27,19 @@
#' @param level Integer, if not \code{NULL} will be added as the header level.
#' @param guess.getter Locigal, if \code{TRUE} try to get a good default getter function for JavaScript
#' variable values.
+#' @param .add Same as \code{...}, but provided as a single list. If used, values will be appended to \code{...}.
#' @return A character string.
#' @export
#' @examples
#' my.cbox <- rk.XML.cbox("This is a test")
#' rk.JS.header("Test results", addFromUI=my.cbox)
-rk.JS.header <- function(title, ..., level=NULL, guess.getter=FALSE){
+rk.JS.header <- function(title, ..., level=NULL, guess.getter=FALSE, .add=list()){
addToHeaderChar <- addLevel <- NULL
addToHeader <- list(...)
+ if(is.list(.add) & length(.add) > 0){
+ addToHeader <- append(addToHeader, .add)
+ } else {}
headerNames <- names(addToHeader)
if(!all(headerNames %in% c("add", "addFromUI"))){
diff --git a/packages/rkwarddev/R/rk.JS.scan.R b/packages/rkwarddev/R/rk.JS.scan.R
index 8c31987..41e1efa 100644
--- a/packages/rkwarddev/R/rk.JS.scan.R
+++ b/packages/rkwarddev/R/rk.JS.scan.R
@@ -64,60 +64,3 @@ rk.JS.scan <- function(pXML, js=TRUE, add.abbrev=FALSE, guess.getter=FALSE, inde
return(result)
}
-
-rk.JS.scan.old <- function(pXML, js=TRUE, add.abbrev=FALSE, guess.getter=FALSE, indent.by="\t"){
-
- JS.relevant.tags <- c("browser", "checkbox", "dropdown", "input", "matrix", "optioncolumn",
- "radio", "saveobject", "select", "spinbox", "valueslot", "varslot")
-
- # getting the relevant IDs out of optionsets is a little tricky
- # this function will probe for sets and return single tags
- single.tags <- check.optionset.tags(XML.obj=pXML, drop=c("comments","cdata", "declarations", "doctype"))
-
- JS.id <- get.IDs(single.tags=single.tags, relevant.tags=JS.relevant.tags, add.abbrev=add.abbrev, tag.names=TRUE)
-
- if("id" %in% colnames(JS.id)){
- if(isTRUE(js)){
- # now
- # <tag id="my.id" ...>
- # will become
- # var my.id = getValue("my.id");
- JS.lines <- paste(unlist(sapply(1:nrow(JS.id), function(this.id){
- return(rk.paste.JS(get.JS.vars(
- JS.var=JS.id[this.id,"abbrev"],
- XML.var=JS.id[this.id,"id"],
- tag.name=JS.id[this.id,"tag"],
- guess.getter=guess.getter),
- level=2, indent.by=indent.by))
- }, USE.NAMES=FALSE)), collapse="\n")
- } else {
- JS.lines <- JS.id[,"id"]
- names(JS.lines) <- NULL
- }
- } else {
- JS.lines <- NULL
- }
-
- # special tags: must be checkable and get "checked" property
- JS.special.tags <- c("frame")
- JS.special.id <- get.IDs(single.tags=single.tags, relevant.tags=JS.special.tags, add.abbrev=add.abbrev,
- tag.names=TRUE, only.checkable=TRUE)
- if("id" %in% colnames(JS.special.id)){
- if(isTRUE(js)){
- JS.lines <- paste0(JS.lines, "\n", paste(unlist(sapply(1:nrow(JS.special.id), function(this.id){
- return(rk.paste.JS(get.JS.vars(
- JS.var=JS.special.id[this.id,"abbrev"],
- XML.var=JS.special.id[this.id,"id"],
- tag.name=JS.special.id[this.id,"tag"],
- modifiers="checked",
- guess.getter=guess.getter),
- level=2, indent.by=indent.by))
- }, USE.NAMES=FALSE)), collapse="\n"))
- } else {
- JS.lines <- c(JS.lines, JS.special.id[,"id"])
- names(JS.lines) <- NULL
- }
- } else {}
-
- return(JS.lines)
-}
diff --git a/packages/rkwarddev/R/rk.plugin.component.R b/packages/rkwarddev/R/rk.plugin.component.R
index 14ef650..466acc5 100644
--- a/packages/rkwarddev/R/rk.plugin.component.R
+++ b/packages/rkwarddev/R/rk.plugin.component.R
@@ -27,8 +27,8 @@
#' If not set, their default values are used. See \code{\link[rkwarddev:rk.XML.plugin]{rk.XML.plugin}} for details.
#' @param js A named list of options to be forwarded to \code{\link[rkwarddev:rk.JS.doc]{rk.JS.doc}}, to generate the JavaScript file.
#' Not all options are supported because some don't make sense in this context. Valid options are:
-#' \code{"require"}, \code{"results.header"}, \code{"variables"}, \code{"globals"}, \code{"preprocess"}, \code{"calculate"}, \code{"printout"},
-#' \code{"doPrintout"} and \code{"load.silencer"}.
+#' \code{"require"}, \code{"results.header"}, \code{"header.add"}, \code{"variables"}, \code{"globals"}, \code{"preprocess"},
+#' \code{"calculate"}, \code{"printout"}, \code{"doPrintout"} and \code{"load.silencer"}.
#' If not set, their default values are used. See \code{\link[rkwarddev:rk.JS.doc]{rk.JS.doc}} for details.
#' @param rkh A named list of options to be forwarded to \code{\link[rkwarddev:rk.rkh.doc]{rk.rkh.doc}}, to generate the help file.
#' Not all options are supported because some don't make sense in this context. Valid options are:
@@ -169,7 +169,7 @@ rk.plugin.component <- function(about, xml=list(), js=list(), rkh=list(),
}
if("js" %in% create & length(js) > 0){
got.JS.options <- names(js)
- for (this.opt in c("require", "globals", "variables", "preprocess", "calculate", "printout", "doPrintout", "load.silencer")){
+ for (this.opt in c("require", "globals", "variables", "preprocess", "calculate", "printout", "doPrintout", "load.silencer", "header.add")){
if(!this.opt %in% got.JS.options) {
js[[this.opt]] <- eval(formals(rk.JS.doc)[[this.opt]])
} else {}
@@ -183,6 +183,7 @@ rk.plugin.component <- function(about, xml=list(), js=list(), rkh=list(),
variables=js[["variables"]],
globals=js[["globals"]],
results.header=js[["results.header"]],
+ header.add=js[["header.add"]],
preprocess=js[["preprocess"]],
calculate=js[["calculate"]],
printout=js[["printout"]],
diff --git a/packages/rkwarddev/R/rk.plugin.skeleton.R b/packages/rkwarddev/R/rk.plugin.skeleton.R
index fbe0239..5766e75 100644
--- a/packages/rkwarddev/R/rk.plugin.skeleton.R
+++ b/packages/rkwarddev/R/rk.plugin.skeleton.R
@@ -48,8 +48,8 @@
#' If not set, their default values are used. See \code{\link[rkwarddev:rk.XML.plugin]{rk.XML.plugin}} for details.
#' @param js A named list of options to be forwarded to \code{\link[rkwarddev:rk.JS.doc]{rk.JS.doc}}, to generate the JavaScript file.
#' Not all options are supported because some don't make sense in this context. Valid options are:
-#' \code{"require"}, \code{"results.header"}, \code{"variables"}, \code{"globals"}, \code{"preprocess"}, \code{"calculate"}, \code{"printout"},
-#' \code{"doPrintout"} and \code{"load.silencer"}.
+#' \code{"require"}, \code{"results.header"}, \code{"header.add"}, \code{"variables"}, \code{"globals"}, \code{"preprocess"},
+#' \code{"calculate"}, \code{"printout"}, \code{"doPrintout"} and \code{"load.silencer"}.
#' If not set, their default values are used. See \code{\link[rkwarddev:rk.JS.doc]{rk.JS.doc}} for details.
#' @param pluginmap A named list of options to be forwarded to \code{\link[rkwarddev:rk.XML.pluginmap]{rk.XML.pluginmap}}, to generate the pluginmap file.
#' Not all options are supported because some don't make sense in this context. Valid options are:
diff --git a/packages/rkwarddev/R/rkwarddev-package.R b/packages/rkwarddev/R/rkwarddev-package.R
index 5cb140c..4b85d2d 100644
--- a/packages/rkwarddev/R/rkwarddev-package.R
+++ b/packages/rkwarddev/R/rkwarddev-package.R
@@ -4,7 +4,7 @@
#' Package: \tab rkwarddev\cr
#' Type: \tab Package\cr
#' Version: \tab 0.06-6\cr
-#' Date: \tab 2014-12-03\cr
+#' Date: \tab 2014-12-04\cr
#' Depends: \tab R (>= 2.9.0),methods,XiMpLe (>= 0.03-21),rkward (>= 0.5.7)\cr
#' Enhances: \tab rkward\cr
#' Encoding: \tab UTF-8\cr
diff --git a/packages/rkwarddev/inst/NEWS.Rd b/packages/rkwarddev/inst/NEWS.Rd
index 7cad0ab..259d2c1 100644
--- a/packages/rkwarddev/inst/NEWS.Rd
+++ b/packages/rkwarddev/inst/NEWS.Rd
@@ -1,7 +1,7 @@
\name{NEWS}
\title{News for Package 'rkwarddev'}
\encoding{UTF-8}
-\section{Changes in rkwarddev version 0.06-6 (2014-12-01)}{
+\section{Changes in rkwarddev version 0.06-6 (2014-12-04)}{
\subsection{fixed}{
\itemize{
\item \code{rk.XML.optionset()} does now allow to re-use objects defined in the same
@@ -13,6 +13,7 @@
\item \code{rk.plugin.skeleton()} still allowed invalid IDs, fixed the regexp
\item \code{rk.XML.snippets()} now also accepts <include> as child node
\item \code{rk.XML.tabbook()} returns <insert> nodes as-is, not nested in <tab></tab>
+ \item \code{rk.JS.scan()} now sets \code{"state"} as default modifier for checkboxes if guess.getter is TRUE
}
}
\subsection{added}{
@@ -25,6 +26,8 @@
\code{"comment"} or \code{"context"} to either produce an i18n comment node or an \code{"i18n_context"} attribute
\item new function \code{rk.i18n.comment()} to give context for translators
\item new function \code{rk.JS.header()} to easily generate JavaScript header code fit for i18n
+ \item \code{rk.JS.doc()}, \code{rk.plugin.skeleton()} and \code{rk.plugin.component()} now use \code{rk.JS.header()} instead of
+ \code{rk.header()}, and also accept its \code{"header.add"} attribute
\item new function \code{R.comment()} to generate JavaScript "\code{comment()}" calls
}
}
@@ -35,6 +38,9 @@
the i18n features of 0.06-4 will be completely replaced with some proper methods now
\item comment nodes (<!-- foo -->) are now globally allowed as child nodes in XML; important for
i18n comments
+ \item modifier checks now point to rkwarddev:::all.valid.modifiers directly in case of errors
+ \item internally, moved the definitions of valid child nodes and modifiers as well as default getter
+ functions and modifiers to separate files, so they're more obvious to find and check
}
}
\subsection{removed}{
diff --git a/packages/rkwarddev/man/rk.JS.doc.Rd b/packages/rkwarddev/man/rk.JS.doc.Rd
index 6cfa1ff..dacdb39 100644
--- a/packages/rkwarddev/man/rk.JS.doc.Rd
+++ b/packages/rkwarddev/man/rk.JS.doc.Rd
@@ -4,9 +4,10 @@
\title{Create JavaScript outline from RKWard plugin XML}
\usage{
rk.JS.doc(require = c(), variables = NULL, globals = NULL,
- results.header = NULL, preprocess = NULL, calculate = NULL,
- printout = NULL, doPrintout = NULL, load.silencer = NULL,
- gen.info = TRUE, indent.by = "\\t")
+ results.header = NULL, header.add = list(), preprocess = NULL,
+ calculate = NULL, printout = NULL, doPrintout = NULL,
+ load.silencer = NULL, gen.info = TRUE, indent.by = "\\t",
+ guess.getter = FALSE)
}
\arguments{
\item{require}{A character vector with names of R packages that the dialog depends on.}
@@ -22,6 +23,9 @@ the function tries to remove duplicate definitions.}
\item{results.header}{A character string to headline the printed results. Include escapes quotes (\\") if needed.
Set to \code{FALSE} or \code{""} if you need more control and want to define the header section in \code{printout}.}
+\item{header.add}{A named list of additional info to add to the header. Each entry must be named \code{add}
+or \code{addFromUI} -- see \code{\link[rkwarddev:rk.JS.header]{rk.JS.header}} for details.}
+
\item{preprocess}{A character string to be included in the \code{preprocess()} function. This string will be
pasted as-is, after \code{require} has been evaluated.}
@@ -47,6 +51,10 @@ hence suppressing all load messages (except for warnings and errors) of required
that it was generated by \code{rkwarddev} and changes should be done to the script.}
\item{indent.by}{A character string defining how indentation should be done.}
+
+\item{guess.getter}{Locigal,
+ if \code{TRUE} try to get a good default getter function for JavaScript
+variable values. Only used if \code{header.add} contains XiMpLe nodes.}
}
\value{
A character string.
@@ -64,6 +72,7 @@ The JavaScript
\code{\link[rkwarddev:ite]{ite}},
\code{\link[rkwarddev:echo]{echo}},
\code{\link[rkwarddev:id]{id}},
+ \code{\link[rkwarddev:rk.JS.header]{rk.JS.header}},
and the \href{help:rkwardplugins}{Introduction to Writing Plugins for RKWard}
}
diff --git a/packages/rkwarddev/man/rk.JS.header.Rd b/packages/rkwarddev/man/rk.JS.header.Rd
index 16503e6..a0dafb1 100644
--- a/packages/rkwarddev/man/rk.JS.header.Rd
+++ b/packages/rkwarddev/man/rk.JS.header.Rd
@@ -3,13 +3,14 @@
\alias{rk.JS.header}
\title{Generate JavaScript header object}
\usage{
-rk.JS.header(title, ..., level = NULL, guess.getter = FALSE)
+rk.JS.header(title, ..., level = NULL, guess.getter = FALSE,
+ .add = list())
}
\arguments{
\item{title}{Either a character string or object of class \code{rk.JS.i18n}. Will become the header title,
nested in an i18n() call.}
-\item{...}{An optional number of additional info to add to the header. each entry must be named \code{add}
+\item{...}{An optional number of additional info to add to the header. Each entry must be named \code{add}
or \code{addFromUI} -- note that you can use multiple entries with the same name here. Entries named
\code{add} must be vectors of legth 2, the first being the caption (character),
the second its value (either
@@ -21,6 +22,9 @@ specifying the GUI element to query (either character or a XiMpLe node from the
\item{guess.getter}{Locigal,
if \code{TRUE} try to get a good default getter function for JavaScript
variable values.}
+
+\item{.add}{Same as \code{...}, but provided as a single list. If used,
+ values will be appended to \code{...}.}
}
\value{
A character string.
diff --git a/packages/rkwarddev/man/rk.plugin.component.Rd b/packages/rkwarddev/man/rk.plugin.component.Rd
index c5930e8..876710e 100644
--- a/packages/rkwarddev/man/rk.plugin.component.Rd
+++ b/packages/rkwarddev/man/rk.plugin.component.Rd
@@ -26,9 +26,9 @@ If not set,
\item{js}{A named list of options to be forwarded to \code{\link[rkwarddev:rk.JS.doc]{rk.JS.doc}},
to generate the JavaScript file.
Not all options are supported because some don't make sense in this context. Valid options are:
-\code{"require"}, \code{"results.header"}, \code{"variables"}, \code{"globals"},
- \code{"preprocess"}, \code{"calculate"}, \code{"printout"},
-\code{"doPrintout"} and \code{"load.silencer"}.
+\code{"require"}, \code{"results.header"}, \code{"header.add"}, \code{"variables"},
+ \code{"globals"}, \code{"preprocess"},
+\code{"calculate"}, \code{"printout"}, \code{"doPrintout"} and \code{"load.silencer"}.
If not set,
their default values are used. See \code{\link[rkwarddev:rk.JS.doc]{rk.JS.doc}} for details.}
diff --git a/packages/rkwarddev/man/rk.plugin.skeleton.Rd b/packages/rkwarddev/man/rk.plugin.skeleton.Rd
index b9a590b..e1e2d92 100644
--- a/packages/rkwarddev/man/rk.plugin.skeleton.Rd
+++ b/packages/rkwarddev/man/rk.plugin.skeleton.Rd
@@ -56,9 +56,9 @@ If not set,
\item{js}{A named list of options to be forwarded to \code{\link[rkwarddev:rk.JS.doc]{rk.JS.doc}},
to generate the JavaScript file.
Not all options are supported because some don't make sense in this context. Valid options are:
-\code{"require"}, \code{"results.header"}, \code{"variables"}, \code{"globals"},
- \code{"preprocess"}, \code{"calculate"}, \code{"printout"},
-\code{"doPrintout"} and \code{"load.silencer"}.
+\code{"require"}, \code{"results.header"}, \code{"header.add"}, \code{"variables"},
+ \code{"globals"}, \code{"preprocess"},
+\code{"calculate"}, \code{"printout"}, \code{"doPrintout"} and \code{"load.silencer"}.
If not set,
their default values are used. See \code{\link[rkwarddev:rk.JS.doc]{rk.JS.doc}} for details.}
diff --git a/packages/rkwarddev/man/rkwarddev-package.Rd b/packages/rkwarddev/man/rkwarddev-package.Rd
index 264d756..fcd7392 100644
--- a/packages/rkwarddev/man/rkwarddev-package.Rd
+++ b/packages/rkwarddev/man/rkwarddev-package.Rd
@@ -11,7 +11,7 @@ A collection of tools for RKWard plugin development.
Package: \tab rkwarddev\cr
Type: \tab Package\cr
Version: \tab 0.06-6\cr
-Date: \tab 2014-12-03\cr
+Date: \tab 2014-12-04\cr
Depends: \tab R (>= 2.9.0),methods,XiMpLe (>= 0.03-21),rkward (>= 0.5.7)\cr
Enhances: \tab rkward\cr
Encoding: \tab UTF-8\cr
diff --git a/rkward/plugins/rkwarddev_scripts/write_csv.R b/rkward/plugins/rkwarddev_scripts/write_csv.R
index 2fb2fb0..69290be 100644
--- a/rkward/plugins/rkwarddev_scripts/write_csv.R
+++ b/rkward/plugins/rkwarddev_scripts/write_csv.R
@@ -394,9 +394,8 @@ etc.JS <- rk.paste.JS(
echo("\n\t)\n\n")
)
-etc.JS.printout <- rk.paste.JS(
- rk.JS.header("Export Table / CSV files", add=c("File", etc.browser), addFromUI=etc.var.data)
-)
+# etc.JS.printout <- rk.paste.JS(
+# )
############
@@ -426,14 +425,15 @@ plugin.dir <- rk.plugin.skeleton(
#snippets=
),
js=list(
- results.header=FALSE,
+ results.header="Export Table / CSV files",
+ header.add=list(add=c("File", etc.browser), addFromUI=etc.var.data),
#load.silencer=,
#require=,
#variables=,
#globals=,
#preprocess=,
- calculate=etc.JS,
- printout=etc.JS.printout#,
+ calculate=etc.JS#,
+# printout=etc.JS.printout#,
#doPrintout=
),
rkh=list(
More information about the rkward-tracker
mailing list