[rkward-cvs] SF.net SVN: rkward:[4337] branches/external_plugins/rk. MultidimensionalScaling/inst/rkward/rkwarddev_MDS_plugin_script.R

[m-eik at users.sourceforge.net]

Revision: 4337
          http://rkward.svn.sourceforge.net/rkward/?rev=4337&view=rev
Author:   m-eik
Date:     2012-09-30 19:47:28 +0000 (Sun, 30 Sep 2012)
Log Message:
-----------
rk.MultidimensionalScaling: updated rkwarddev plugin script

Modified Paths:
--------------
    branches/external_plugins/rk.MultidimensionalScaling/inst/rkward/rkwarddev_MDS_plugin_script.R

Modified: branches/external_plugins/rk.MultidimensionalScaling/inst/rkward/rkwarddev_MDS_plugin_script.R
===================================================================
--- branches/external_plugins/rk.MultidimensionalScaling/inst/rkward/rkwarddev_MDS_plugin_script.R	2012-09-30 19:46:35 UTC (rev 4336)
+++ branches/external_plugins/rk.MultidimensionalScaling/inst/rkward/rkwarddev_MDS_plugin_script.R	2012-09-30 19:47:28 UTC (rev 4337)
@@ -33,9 +33,8 @@
 	),
 	label="Data preparation")
 
-generic.plot.options <- rk.XML.embed(component="rkward::plot_options", button=TRUE, label="Generic plot options")
-js.po.printout <- rk.JS.vars(generic.plot.options, modifiers="code.printout", check.modifiers=FALSE)
-plot.text.color <- rk.XML.embed(component="rkward::color_chooser", button=FALSE)
+generic.plot.options <- rk.plotOptions()
+plot.text.color <- rk.plotOptions(embed="rkward::color_chooser", button=FALSE)
 
 ############
 ## classical multidimensional scaling
@@ -197,19 +196,19 @@
 mds.js.plot <- rk.paste.JS(
 	js.frm.labels <- rk.JS.vars(mds.plot.frame.labels, modifiers="checked"),
 	ite(mds.plot.cbox.plot, rk.paste.JS(echo("\n"),
+		plot.text.color,
 		rk.paste.JS.graph(
 			rk.comment("label text color:"),
-			js.po.label.color <- rk.JS.vars(plot.text.color, modifiers="code.printout", check.modifiers=FALSE),
 			echo("\t\tplot(mds.result"),
 			ite(id(mds.drop.meth, " == \"isoMDS\" || ", mds.drop.meth, " == \"sammon\""), echo("[[\"points\"]]")),
-			ite(id("!", js.po.printout, ".match(/main\\s*=/)"),
+			ite(id("!", generic.plot.options, ".match(/main\\s*=/)"),
 				echo(",\n\t\t\tmain=\"Multidimensional scaling\"")),
-			ite(id("!", js.po.printout, ".match(/sub\\s*=/)"),
+			ite(id("!", generic.plot.options, ".match(/sub\\s*=/)"),
 				echo(",\n\t\t\tsub=\"Solution with ", mds.spin.ndim, " dimensions (", mds.drop.meth, ")\"")),
 			# turn off points if labels should replace them
 			ite(id(js.frm.labels, " && ", mds.plot.spin.label.pos, " == 0"), echo(",\n\t\t\ttype=\"n\"")),
 			# generic plot options go here
-			id("echo(", js.po.printout, ".replace(/, /g, \",\\n\\t\\t\\t\"));"),
+			id("echo(", generic.plot.options, ".replace(/, /g, \",\\n\\t\\t\\t\"));"),
 			echo(")"),
 			ite(js.frm.labels, rk.paste.JS(
 				echo("\n\t\ttext(mds.result"),
@@ -219,9 +218,8 @@
 					),
 				ite(id(mds.plot.spin.label.cex, " != 1"), echo(",\n\t\t\tcex=", mds.plot.spin.label.cex)),
 				ite(id(mds.plot.spin.label.pos, " != 0"), echo(",\n\t\t\tpos=", mds.plot.spin.label.pos)),
-				echo(js.po.label.color, ")"), level=4)),
-			plotOpts=generic.plot.options,
-			printoutObj=js.po.printout
+				echo(plot.text.color, ")"), level=4)),
+			plotOpts=generic.plot.options
 		), level=3)
 	),
 	ite("full", rk.paste.JS(echo("\nrk.print(mds.result)\n"),

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.