[rkward-cvs] SF.net SVN: rkward-code:[4591] trunk/rkward/packages/rkwarddev
m-eik at users.sf.net
m-eik at users.sf.net
Wed Mar 13 21:27:14 UTC 2013
Revision: 4591
http://sourceforge.net/p/rkward/code/4591
Author: m-eik
Date: 2013-03-13 21:27:14 +0000 (Wed, 13 Mar 2013)
Log Message:
-----------
rkwarddev: added/updated modifiers for matrix, optionset & switch, fixed a bug triggered by cases of multiple plugin authors
Modified Paths:
--------------
trunk/rkward/packages/rkwarddev/ChangeLog
trunk/rkward/packages/rkwarddev/DESCRIPTION
trunk/rkward/packages/rkwarddev/R/rk-internal.R
trunk/rkward/packages/rkwarddev/R/rk.plugin.skeleton.R
trunk/rkward/packages/rkwarddev/R/rkwarddev-package.R
trunk/rkward/packages/rkwarddev/inst/NEWS.Rd
trunk/rkward/packages/rkwarddev/inst/doc/rkwarddev_vignette.pdf
trunk/rkward/packages/rkwarddev/man/rkwarddev-package.Rd
Modified: trunk/rkward/packages/rkwarddev/ChangeLog
===================================================================
--- trunk/rkward/packages/rkwarddev/ChangeLog 2013-03-13 18:30:14 UTC (rev 4590)
+++ trunk/rkward/packages/rkwarddev/ChangeLog 2013-03-13 21:27:14 UTC (rev 4591)
@@ -1,6 +1,6 @@
ChangeLog for package rkwarddev
-changes in version 0.06-2 (2013-03-11)
+changes in version 0.06-2 (2013-03-13)
changed:
- the structure of <about> nodes will change in RKWard 0.6.1,
<dependencies> will become a direct child of <document> or <component>, which explains
@@ -38,11 +38,14 @@
without quoting it
- new combined modifiers "visible.not", "visible.numeric", "enabled.not",
"enabled.numeric", "state.not" and "state.numeric" are now supported
+ - modifiers have been added for <optionset> and <matrix>, and <switch> can
+ have any modifier
fixed:
- added some missing parameter in the docs for rk.paste.JS.graph()
- fixed a bug in the modifier checks; this unveiled a bug in how
rk.JS.scan() dealt with <frame> nodes, which was also fixed
- fixed a duplicate entry in this ChangeLog for version 0.04-6
+ - rk.plugin.skeleton() now correctly works with more than one author
changes in version 0.06-1 (2012-11-08)
changed:
Modified: trunk/rkward/packages/rkwarddev/DESCRIPTION
===================================================================
--- trunk/rkward/packages/rkwarddev/DESCRIPTION 2013-03-13 18:30:14 UTC (rev 4590)
+++ trunk/rkward/packages/rkwarddev/DESCRIPTION 2013-03-13 21:27:14 UTC (rev 4591)
@@ -15,7 +15,7 @@
Authors at R: c(person(given="Meik", family="Michalke",
email="meik.michalke at hhu.de", role=c("aut", "cre")))
Version: 0.06-2
-Date: 2013-03-11
+Date: 2013-03-13
Collate:
'echo.R'
'id.R'
Modified: trunk/rkward/packages/rkwarddev/R/rk-internal.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk-internal.R 2013-03-13 18:30:14 UTC (rev 4590)
+++ trunk/rkward/packages/rkwarddev/R/rk-internal.R 2013-03-13 21:27:14 UTC (rev 4591)
@@ -621,23 +621,25 @@
all.valid.modifiers <- list(
all=c("", "visible", "visible.not", "visible.numeric", "enabled", "enabled.not", "enabled.numeric",
"required", "true", "false", "not", "numeric", "preprocess", "calculate", "printout", "preview"),
- text=c("text"),
- varselector=c("selected", "root"),
- varslot=c("available", "selected", "source", "shortname", "label"),
- radio=c("string", "number"),
+ browser=c("selection"),
+ checkbox=c("state", "state.not", "state.numeric"),
dropdown=c("string", "number"),
- # option=c(),
- checkbox=c("state", "state.not", "state.numeric"),
+# removed embed, can be all sorts of stuff, see e.g. generic plot options
+# embed=c("code"),
+# for the same reason external is not listed here
frame=c("checked", "checked.not", "checked.numeric"),
input=c("text"),
- browser=c("selection"),
+ formula=c("model", "table", "labels", "fixed_factors", "dependent"),
+ matrix=c("rows", "columns", "tsv", "cbind"), # TODO: missing a solution for 1,2,3,... here
+ # option=c(),
+ optionset=c("row_count", "current_row", "optioncolumn_ids"),
+ preview=c("state", "state.not", "state.numeric"),
+ radio=c("string", "number"),
saveobject=c("selection", "parent", "objectname", "active"),
spinbox=c("int", "real"),
- formula=c("model", "table", "labels", "fixed_factors", "dependent"),
-# removed embed, can be all sorts of stuff, see e.g. generic plot options
-# embed=c("code"),
-# for the same reason external is not listed here
- preview=c("state", "state.not", "state.numeric")
+ text=c("text"),
+ varselector=c("selected", "root"),
+ varslot=c("available", "selected", "source", "shortname", "label")
) ## end list with valid modifiers
@@ -655,8 +657,8 @@
if(is.XiMpLe.node(source)){
tag.name <- XMLName(source)
- # embedded plugins can have all sorts of modifiers
- if(tag.name %in% c("embed", "external")){
+ # certain elemens/embedded plugins can have all sorts of modifiers
+ if(tag.name %in% c("embed", "external", "switch")){
if(isTRUE(bool)){
return(TRUE)
} else {
Modified: trunk/rkward/packages/rkwarddev/R/rk.plugin.skeleton.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.plugin.skeleton.R 2013-03-13 18:30:14 UTC (rev 4590)
+++ trunk/rkward/packages/rkwarddev/R/rk.plugin.skeleton.R 2013-03-13 21:27:14 UTC (rev 4591)
@@ -352,20 +352,20 @@
desc <- data.frame(
Package=name,
Type="Package",
- Title=slot(about.node, "attributes")[["shortinfo"]],
- Version=slot(about.node, "attributes")[["version"]],
- Date=slot(about.node, "attributes")[["releasedate"]],
- Author=all.authors,
+ Title=XMLAttrs(about.node)[["shortinfo"]],
+ Version=XMLAttrs(about.node)[["version"]],
+ Date=XMLAttrs(about.node)[["releasedate"]],
+ Author=paste(all.authors, collapse=", "),
AuthorsR=XML2person(about.node, eval=FALSE),
- Maintainer=all.maintainers,
+ Maintainer=paste(all.maintainers, collapse=", "),
Depends=XML2dependencies(dependencies.node, suggest=suggest.required, mode="depends"),
Suggests=XML2dependencies(dependencies.node, suggest=suggest.required, mode="suggest"),
Enhances="rkward",
- Description=slot(about.node, "attributes")[["longinfo"]],
- License=slot(about.node, "attributes")[["license"]],
+ Description=XMLAttrs(about.node)[["longinfo"]],
+ License=XMLAttrs(about.node)[["license"]],
# Encoding="UTF-8",
LazyLoad=ifelse(isTRUE(lazyLoad), "yes", "no"),
- URL=slot(about.node, "attributes")[["url"]],
+ URL=XMLAttrs(about.node)[["url"]],
# # R 2.14 seems to add "Namespace: auto", which invalidates source packages for R < 2.14
# Namespace=name,
stringsAsFactors=FALSE)
Modified: trunk/rkward/packages/rkwarddev/R/rkwarddev-package.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rkwarddev-package.R 2013-03-13 18:30:14 UTC (rev 4590)
+++ trunk/rkward/packages/rkwarddev/R/rkwarddev-package.R 2013-03-13 21:27:14 UTC (rev 4591)
@@ -4,7 +4,7 @@
#' Package: \tab rkwarddev\cr
#' Type: \tab Package\cr
#' Version: \tab 0.06-2\cr
-#' Date: \tab 2013-03-11\cr
+#' Date: \tab 2013-03-13\cr
#' Depends: \tab R (>= 2.9.0),methods,XiMpLe (>= 0.03-18),rkward (>= 0.5.6)\cr
#' Enhances: \tab rkward\cr
#' Encoding: \tab UTF-8\cr
Modified: trunk/rkward/packages/rkwarddev/inst/NEWS.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/inst/NEWS.Rd 2013-03-13 18:30:14 UTC (rev 4590)
+++ trunk/rkward/packages/rkwarddev/inst/NEWS.Rd 2013-03-13 21:27:14 UTC (rev 4591)
@@ -1,7 +1,7 @@
\name{NEWS}
\title{News for Package 'rkwarddev'}
\encoding{UTF-8}
-\section{Changes in rkwarddev version 0.06-2 (2013-03-11)}{
+\section{Changes in rkwarddev version 0.06-2 (2013-03-13)}{
\subsection{changed}{
\itemize{
\item the structure of <about> nodes will change in RKWard 0.6.1,
@@ -43,6 +43,8 @@
without quoting it
\item new combined modifiers \code{"visible.not"}, \code{"visible.numeric"}, \code{"enabled.not"},
\code{"enabled.numeric"}, \code{"state.not"} and \code{"state.numeric"} are now supported
+ \item modifiers have been added for <optionset> and <matrix>, and <switch> can
+ have any modifier
}
}
\subsection{fixed}{
@@ -51,6 +53,7 @@
\item fixed a bug in the modifier checks; this unveiled a bug in how
\code{rk.JS.scan()} dealt with <frame> nodes, which was also fixed
\item fixed a duplicate entry in this ChangeLog for version 0.04-6
+ \item \code{rk.plugin.skeleton()} now correctly works with more than one author
}
}
}
Modified: trunk/rkward/packages/rkwarddev/inst/doc/rkwarddev_vignette.pdf
===================================================================
(Binary files differ)
Modified: trunk/rkward/packages/rkwarddev/man/rkwarddev-package.Rd
===================================================================
--- trunk/rkward/packages/rkwarddev/man/rkwarddev-package.Rd 2013-03-13 18:30:14 UTC (rev 4590)
+++ trunk/rkward/packages/rkwarddev/man/rkwarddev-package.Rd 2013-03-13 21:27:14 UTC (rev 4591)
@@ -9,7 +9,7 @@
\details{
\tabular{ll}{ Package: \tab rkwarddev\cr Type: \tab
Package\cr Version: \tab 0.06-2\cr Date: \tab
- 2013-03-11\cr Depends: \tab R (>= 2.9.0),methods,XiMpLe
+ 2013-03-13\cr Depends: \tab R (>= 2.9.0),methods,XiMpLe
(>= 0.03-18),rkward (>= 0.5.6)\cr Enhances: \tab
rkward\cr Encoding: \tab UTF-8\cr License: \tab GPL (>=
3)\cr LazyLoad: \tab yes\cr URL: \tab
More information about the rkward-tracker
mailing list