[rkward-cvs] SF.net SVN: rkward-code:[4698] branches/external_plugins

m-eik at users.sf.net m-eik at users.sf.net
Sun Apr 14 19:13:34 UTC 2013


Revision: 4698
          http://sourceforge.net/p/rkward/code/4698
Author:   m-eik
Date:     2013-04-14 19:13:29 +0000 (Sun, 14 Apr 2013)
Log Message:
-----------
fixing the ANOVA and MDS plugins as well

Modified Paths:
--------------
    branches/external_plugins/rk.ANOVA/ChangeLog
    branches/external_plugins/rk.ANOVA/DESCRIPTION
    branches/external_plugins/rk.ANOVA/R/rk.ANOVA-package.R
    branches/external_plugins/rk.ANOVA/debian/changelog
    branches/external_plugins/rk.ANOVA/inst/CITATION
    branches/external_plugins/rk.ANOVA/inst/NEWS.Rd
    branches/external_plugins/rk.ANOVA/inst/rkward/plugins/PairwisetTests.xml
    branches/external_plugins/rk.ANOVA/inst/rkward/rk.ANOVA.pluginmap
    branches/external_plugins/rk.ANOVA/inst/rkward/rkwarddev_ANOVA_plugin_script.R
    branches/external_plugins/rk.ANOVA/man/rk.ANOVA-package.Rd
    branches/external_plugins/rk.ClusterAnalysis/ChangeLog
    branches/external_plugins/rk.ClusterAnalysis/DESCRIPTION
    branches/external_plugins/rk.ClusterAnalysis/R/rk.ClusterAnalysis-package.R
    branches/external_plugins/rk.ClusterAnalysis/debian/changelog
    branches/external_plugins/rk.ClusterAnalysis/inst/CITATION
    branches/external_plugins/rk.ClusterAnalysis/inst/NEWS.Rd
    branches/external_plugins/rk.ClusterAnalysis/inst/rkward/rk.ClusterAnalysis.pluginmap
    branches/external_plugins/rk.ClusterAnalysis/man/rk.ClusterAnalysis-package.Rd
    branches/external_plugins/rk.MultidimensionalScaling/ChangeLog
    branches/external_plugins/rk.MultidimensionalScaling/DESCRIPTION
    branches/external_plugins/rk.MultidimensionalScaling/R/rk.MultidimensionalScaling-package.R
    branches/external_plugins/rk.MultidimensionalScaling/debian/changelog
    branches/external_plugins/rk.MultidimensionalScaling/inst/CITATION
    branches/external_plugins/rk.MultidimensionalScaling/inst/NEWS.Rd
    branches/external_plugins/rk.MultidimensionalScaling/inst/rkward/plugins/Multidimensionalscaling.xml
    branches/external_plugins/rk.MultidimensionalScaling/inst/rkward/rk.MultidimensionalScaling.pluginmap
    branches/external_plugins/rk.MultidimensionalScaling/inst/rkward/rkwarddev_MDS_plugin_script.R
    branches/external_plugins/rk.MultidimensionalScaling/man/rk.MultidimensionalScaling-package.Rd

Modified: branches/external_plugins/rk.ANOVA/ChangeLog
===================================================================
--- branches/external_plugins/rk.ANOVA/ChangeLog	2013-04-14 07:08:54 UTC (rev 4697)
+++ branches/external_plugins/rk.ANOVA/ChangeLog	2013-04-14 19:13:29 UTC (rev 4698)
@@ -1,5 +1,10 @@
 ChangeLog for package rk.ANOVA
 
+changes in version 0.01-17 (2013-04-14)
+fixed:
+  - corrected logic sections in pairwise t-tests dialog
+    (options for pooled SDs and pairwise tests were not correctly enabled/disabled)
+
 changes in version 0.01-16 (2013-04-04)
 added:
   - debianized the plugin

Modified: branches/external_plugins/rk.ANOVA/DESCRIPTION
===================================================================
--- branches/external_plugins/rk.ANOVA/DESCRIPTION	2013-04-14 07:08:54 UTC (rev 4697)
+++ branches/external_plugins/rk.ANOVA/DESCRIPTION	2013-04-14 19:13:29 UTC (rev 4698)
@@ -2,8 +2,8 @@
 Type: Package
 Title: RKWard GUI to conduct ANOVAs (using the ez package), pairwise t-Tests
     and plot interactions.
-Version: 0.01-16
-Date: 2013-04-04
+Version: 0.01-17
+Date: 2013-04-14
 Author: Meik Michalke <meik.michalke at hhu.de>
 Maintainer: Meik Michalke <meik.michalke at hhu.de>
 Depends:

Modified: branches/external_plugins/rk.ANOVA/R/rk.ANOVA-package.R
===================================================================
--- branches/external_plugins/rk.ANOVA/R/rk.ANOVA-package.R	2013-04-14 07:08:54 UTC (rev 4697)
+++ branches/external_plugins/rk.ANOVA/R/rk.ANOVA-package.R	2013-04-14 19:13:29 UTC (rev 4698)
@@ -3,8 +3,8 @@
 #' \tabular{ll}{
 #' Package: \tab rk.ANOVA\cr
 #' Type: \tab Package\cr
-#' Version: \tab 0.01-16\cr
-#' Date: \tab 2013-04-04\cr
+#' Version: \tab 0.01-17\cr
+#' Date: \tab 2013-04-14\cr
 #' Depends: \tab  rkward (>= 0.5.6)\cr
 #' Enhances: \tab rkward\cr
 #' License: \tab GPL (>= 3)\cr

Modified: branches/external_plugins/rk.ANOVA/debian/changelog
===================================================================
--- branches/external_plugins/rk.ANOVA/debian/changelog	2013-04-14 07:08:54 UTC (rev 4697)
+++ branches/external_plugins/rk.ANOVA/debian/changelog	2013-04-14 19:13:29 UTC (rev 4698)
@@ -1,3 +1,9 @@
+r-other-rkward-rk.anova (0.01-17-1) unstable; urgency=low
+
+  * new upstream release
+
+ -- m.eik michalke <meik.michalke at hhu.de>  Sun, 14 Apr 2013 21:03:02 +0000
+
 r-other-rkward-rk.anova (0.01-16-2) unstable; urgency=low
 
   * renamed package (keep the period in name)

Modified: branches/external_plugins/rk.ANOVA/inst/CITATION
===================================================================
--- branches/external_plugins/rk.ANOVA/inst/CITATION	2013-04-14 07:08:54 UTC (rev 4697)
+++ branches/external_plugins/rk.ANOVA/inst/CITATION	2013-04-14 19:13:29 UTC (rev 4698)
@@ -2,12 +2,12 @@
 		title="rk.ANOVA: RKWard GUI to conduct ANOVAs (using the ez package), pairwise t-Tests and plot interactions.",
 		author="Meik Michalke",
 		year="2013",
-		note="(Version 0.01-16)",
+		note="(Version 0.01-17)",
 		url="http://rkward.sf.net",
 
 		textVersion =
 		paste("Michalke, M. (2013). ",
-				"rk.ANOVA: RKWard GUI to conduct ANOVAs (using the ez package), pairwise t-Tests and plot interactions. (Version 0.01-16). ",
+				"rk.ANOVA: RKWard GUI to conduct ANOVAs (using the ez package), pairwise t-Tests and plot interactions. (Version 0.01-17). ",
 				"Available from http://rkward.sf.net",
 				sep=""),
 

Modified: branches/external_plugins/rk.ANOVA/inst/NEWS.Rd
===================================================================
--- branches/external_plugins/rk.ANOVA/inst/NEWS.Rd	2013-04-14 07:08:54 UTC (rev 4697)
+++ branches/external_plugins/rk.ANOVA/inst/NEWS.Rd	2013-04-14 19:13:29 UTC (rev 4698)
@@ -1,5 +1,13 @@
 \name{NEWS}
 \title{News for Package 'rk.ANOVA'}
+\section{Changes in rk.ANOVA version 0.01-17 (2013-04-14)}{
+  \subsection{fixed}{
+    \itemize{
+      \item corrected logic sections in pairwise t-tests dialog
+        (options for pooled SDs and pairwise tests were not correctly enabled/disabled)
+    }
+  }
+}
 \section{Changes in rk.ANOVA version 0.01-16 (2013-04-04)}{
   \subsection{added}{
     \itemize{

Modified: branches/external_plugins/rk.ANOVA/inst/rkward/plugins/PairwisetTests.xml
===================================================================
--- branches/external_plugins/rk.ANOVA/inst/rkward/plugins/PairwisetTests.xml	2013-04-14 07:08:54 UTC (rev 4697)
+++ branches/external_plugins/rk.ANOVA/inst/rkward/plugins/PairwisetTests.xml	2013-04-14 19:13:29 UTC (rev 4698)
@@ -5,10 +5,8 @@
 	<code file="PairwisetTests.js" />
 	<help file="PairwisetTests.rkh" />
 	<logic>
-		<convert id="lgc_chcPldSD" sources="chc_PldSDfrl.state" mode="equals" standard="true" />
-		<connect governor="lgc_chcPldSD.not" client="chc_PrdtTsts.enabled" />
-		<convert id="lgc_chcPrdtT" sources="chc_PrdtTsts.state" mode="equals" standard="true" />
-		<connect governor="lgc_chcPrdtT.not" client="chc_PldSDfrl.enabled" />
+		<connect governor="chc_PldSDfrl.state.not" client="chc_PrdtTsts.enabled" />
+		<connect governor="chc_PrdtTsts.state.not" client="chc_PldSDfrl.enabled" />
 		<convert id="lgc_rdDtfrmt" sources="rad_Datafrmt.string" mode="equals" standard="one" />
 		<connect governor="lgc_rdDtfrmt" client="vrsl_Rspnsvct.visible" />
 		<connect governor="lgc_rdDtfrmt" client="vrsl_Rspnsvct.required" />

Modified: branches/external_plugins/rk.ANOVA/inst/rkward/rk.ANOVA.pluginmap
===================================================================
--- branches/external_plugins/rk.ANOVA/inst/rkward/rk.ANOVA.pluginmap	2013-04-14 07:08:54 UTC (rev 4697)
+++ branches/external_plugins/rk.ANOVA/inst/rkward/rk.ANOVA.pluginmap	2013-04-14 19:13:29 UTC (rev 4698)
@@ -16,8 +16,8 @@
 		name="rk.ANOVA"
 		shortinfo="RKWard GUI to conduct ANOVAs (using the ez package), pairwise t-Tests and plot interactions."
 		longinfo="RKWard GUI to conduct ANOVAs (using the ez package), pairwise t-Tests and plot interactions."
-		version="0.01-16"
-		releasedate="2013-04-04"
+		version="0.01-17"
+		releasedate="2013-04-14"
 		url="http://rkward.sf.net"
 		license="GPL (>= 3)"
 	>

Modified: branches/external_plugins/rk.ANOVA/inst/rkward/rkwarddev_ANOVA_plugin_script.R
===================================================================
--- branches/external_plugins/rk.ANOVA/inst/rkward/rkwarddev_ANOVA_plugin_script.R	2013-04-14 07:08:54 UTC (rev 4697)
+++ branches/external_plugins/rk.ANOVA/inst/rkward/rkwarddev_ANOVA_plugin_script.R	2013-04-14 19:13:29 UTC (rev 4698)
@@ -18,7 +18,7 @@
 		person(given="Meik", family="Michalke",
 			email="meik.michalke at hhu.de", role=c("aut","cre"))),
 	about=list(desc="RKWard GUI to conduct ANOVAs (using the ez package), pairwise t-Tests and plot interactions.",
-		version="0.01-16", url="http://rkward.sf.net")
+		version="0.01-17", url="http://rkward.sf.net")
 	)
 dependencies.info <- rk.XML.dependencies(
 	dependencies=list(rkward.min=ifelse(isTRUE(guess.getter), "0.6.0", "0.5.6")),
@@ -314,10 +314,8 @@
 
 ## logic
 pt.lgc.sect <- rk.XML.logic(
-  		pt.gov.pool <- rk.XML.convert(sources=list(state=pt.chk.poolSD), mode=c(equals="true")),
-  		rk.XML.connect(governor=pt.gov.pool, client=pt.chk.paired, set="enabled", not=TRUE),
-		pt.gov.pair <- rk.XML.convert(sources=list(state=pt.chk.paired), mode=c(equals="true")),
-		rk.XML.connect(governor=pt.gov.pair, client=pt.chk.poolSD, set="enabled", not=TRUE),
+		rk.XML.connect(governor=pt.chk.poolSD, client=pt.chk.paired, set="enabled", not=TRUE),
+		rk.XML.connect(governor=pt.chk.paired, client=pt.chk.poolSD, set="enabled", not=TRUE),
 		pt.gov.onevar <- rk.XML.convert(sources=list(string=pt.data.format), mode=c(equals="one")),
 		rk.XML.connect(governor=pt.gov.onevar, client=pt.tvar.data, set="visible"),
 		rk.XML.connect(governor=pt.gov.onevar, client=pt.tvar.data, set="required"),

Modified: branches/external_plugins/rk.ANOVA/man/rk.ANOVA-package.Rd
===================================================================
--- branches/external_plugins/rk.ANOVA/man/rk.ANOVA-package.Rd	2013-04-14 07:08:54 UTC (rev 4697)
+++ branches/external_plugins/rk.ANOVA/man/rk.ANOVA-package.Rd	2013-04-14 19:13:29 UTC (rev 4698)
@@ -9,8 +9,8 @@
 }
 \details{
   \tabular{ll}{ Package: \tab rk.ANOVA\cr Type: \tab
-  Package\cr Version: \tab 0.01-16\cr Date: \tab
-  2013-04-04\cr Depends: \tab rkward (>= 0.5.6)\cr
+  Package\cr Version: \tab 0.01-17\cr Date: \tab
+  2013-04-14\cr Depends: \tab rkward (>= 0.5.6)\cr
   Enhances: \tab rkward\cr License: \tab GPL (>= 3)\cr
   LazyLoad: \tab yes\cr URL: \tab http://rkward.sf.net\cr }
 

Modified: branches/external_plugins/rk.ClusterAnalysis/ChangeLog
===================================================================
--- branches/external_plugins/rk.ClusterAnalysis/ChangeLog	2013-04-14 07:08:54 UTC (rev 4697)
+++ branches/external_plugins/rk.ClusterAnalysis/ChangeLog	2013-04-14 19:13:29 UTC (rev 4698)
@@ -1,6 +1,6 @@
 ChangeLog for package rk.ClusterAnalysis
 
-changes in version 0.01-10 (2013-04-12)
+changes in version 0.01-10 (2013-04-14)
 fixed:
   - corrected logic sections in hierarchical CA and determine number of clusters dialogs
     (distance calculation was not correctly enabled/disabled)

Modified: branches/external_plugins/rk.ClusterAnalysis/DESCRIPTION
===================================================================
--- branches/external_plugins/rk.ClusterAnalysis/DESCRIPTION	2013-04-14 07:08:54 UTC (rev 4697)
+++ branches/external_plugins/rk.ClusterAnalysis/DESCRIPTION	2013-04-14 19:13:29 UTC (rev 4698)
@@ -1,18 +1,22 @@
 Package: rk.ClusterAnalysis
 Type: Package
-Title: RKWard GUI to conduct k-means, model based and hierarchical
-        cluster analyses
+Title: RKWard GUI to conduct k-means, model based and hierarchical cluster
+    analyses
 Version: 0.01-10
-Date: 2013-04-13
+Date: 2013-04-14
 Author: Meik Michalke <meik.michalke at hhu.de>
 Maintainer: Meik Michalke <meik.michalke at hhu.de>
-Depends: rkward (>= 0.5.6)
-Suggests: mclust
+Depends:
+    rkward (>= 0.5.6)
+Suggests:
+    mclust
 Enhances: rkward
-Description: RKWard GUI to conduct k-means, model based and
-        hierarchical cluster analyses
+Description: RKWard GUI to conduct k-means, model based and hierarchical
+    cluster analyses
 License: GPL (>= 3)
 LazyLoad: yes
 URL: http://rkward.sf.net
 Authors at R: person(given="Meik", family="Michalke",
-        email="meik.michalke at hhu.de", role=c("aut", "cre"))
+    email="meik.michalke at hhu.de", role=c("aut", "cre"))
+Collate:
+    'rk.ClusterAnalysis-package.R'

Modified: branches/external_plugins/rk.ClusterAnalysis/R/rk.ClusterAnalysis-package.R
===================================================================
--- branches/external_plugins/rk.ClusterAnalysis/R/rk.ClusterAnalysis-package.R	2013-04-14 07:08:54 UTC (rev 4697)
+++ branches/external_plugins/rk.ClusterAnalysis/R/rk.ClusterAnalysis-package.R	2013-04-14 19:13:29 UTC (rev 4698)
@@ -3,8 +3,8 @@
 #' \tabular{ll}{
 #' Package: \tab rk.ClusterAnalysis\cr
 #' Type: \tab Package\cr
-#' Version: \tab 0.01-9\cr
-#' Date: \tab 2013-04-04\cr
+#' Version: \tab 0.01-10\cr
+#' Date: \tab 2013-04-14\cr
 #' Depends: \tab  rkward (>= 0.5.6)\cr
 #' Enhances: \tab rkward\cr
 #' License: \tab GPL (>= 3)\cr

Modified: branches/external_plugins/rk.ClusterAnalysis/debian/changelog
===================================================================
--- branches/external_plugins/rk.ClusterAnalysis/debian/changelog	2013-04-14 07:08:54 UTC (rev 4697)
+++ branches/external_plugins/rk.ClusterAnalysis/debian/changelog	2013-04-14 19:13:29 UTC (rev 4698)
@@ -1,3 +1,9 @@
+r-other-rkward-rk.clusteranalysis (0.01-10-1) unstable; urgency=low
+
+  * new upstream release
+
+ -- m.eik michalke <meik.michalke at hhu.de>  Sun, 14 Apr 2013 21:03:31 +0000
+
 r-other-rkward-rk.clusteranalysis (0.01-9-2) unstable; urgency=low
 
   * renamed package (keep the period in name)

Modified: branches/external_plugins/rk.ClusterAnalysis/inst/CITATION
===================================================================
--- branches/external_plugins/rk.ClusterAnalysis/inst/CITATION	2013-04-14 07:08:54 UTC (rev 4697)
+++ branches/external_plugins/rk.ClusterAnalysis/inst/CITATION	2013-04-14 19:13:29 UTC (rev 4698)
@@ -2,12 +2,12 @@
 		title="rk.ClusterAnalysis: RKWard GUI to conduct k-means, model based and hierarchical cluster analyses",
 		author="Meik Michalke",
 		year="2013",
-		note="(Version 0.01-9)",
+		note="(Version 0.01-10)",
 		url="http://rkward.sf.net",
 
 		textVersion =
 		paste("Michalke, M. (2013). ",
-				"rk.ClusterAnalysis: RKWard GUI to conduct k-means, model based and hierarchical cluster analyses (Version 0.01-9). ",
+				"rk.ClusterAnalysis: RKWard GUI to conduct k-means, model based and hierarchical cluster analyses (Version 0.01-10). ",
 				"Available from http://rkward.sf.net",
 				sep=""),
 

Modified: branches/external_plugins/rk.ClusterAnalysis/inst/NEWS.Rd
===================================================================
--- branches/external_plugins/rk.ClusterAnalysis/inst/NEWS.Rd	2013-04-14 07:08:54 UTC (rev 4697)
+++ branches/external_plugins/rk.ClusterAnalysis/inst/NEWS.Rd	2013-04-14 19:13:29 UTC (rev 4698)
@@ -1,5 +1,13 @@
 \name{NEWS}
 \title{News for Package 'rk.ClusterAnalysis'}
+\section{Changes in rk.ClusterAnalysis version 0.01-10 (2013-04-14)}{
+  \subsection{fixed}{
+    \itemize{
+      \item corrected logic sections in hierarchical CA and determine number of clusters dialogs
+        (distance calculation was not correctly enabled/disabled)
+    }
+  }
+}
 \section{Changes in rk.ClusterAnalysis version 0.01-9 (2013-04-04)}{
   \subsection{added}{
     \itemize{

Modified: branches/external_plugins/rk.ClusterAnalysis/inst/rkward/rk.ClusterAnalysis.pluginmap
===================================================================
--- branches/external_plugins/rk.ClusterAnalysis/inst/rkward/rk.ClusterAnalysis.pluginmap	2013-04-14 07:08:54 UTC (rev 4697)
+++ branches/external_plugins/rk.ClusterAnalysis/inst/rkward/rk.ClusterAnalysis.pluginmap	2013-04-14 19:13:29 UTC (rev 4698)
@@ -16,7 +16,7 @@
 		shortinfo="RKWard GUI to conduct k-means, model based and hierarchical cluster analyses"
 		longinfo="RKWard GUI to conduct k-means, model based and hierarchical cluster analyses"
 		version="0.01-10"
-		releasedate="2013-04-13"
+		releasedate="2013-04-14"
 		url="http://rkward.sf.net"
 		license="GPL (>= 3)"
 	>

Modified: branches/external_plugins/rk.ClusterAnalysis/man/rk.ClusterAnalysis-package.Rd
===================================================================
--- branches/external_plugins/rk.ClusterAnalysis/man/rk.ClusterAnalysis-package.Rd	2013-04-14 07:08:54 UTC (rev 4697)
+++ branches/external_plugins/rk.ClusterAnalysis/man/rk.ClusterAnalysis-package.Rd	2013-04-14 19:13:29 UTC (rev 4698)
@@ -9,8 +9,8 @@
 }
 \details{
   \tabular{ll}{ Package: \tab rk.ClusterAnalysis\cr Type:
-  \tab Package\cr Version: \tab 0.01-9\cr Date: \tab
-  2013-04-04\cr Depends: \tab rkward (>= 0.5.6)\cr
+  \tab Package\cr Version: \tab 0.01-10\cr Date: \tab
+  2013-04-14\cr Depends: \tab rkward (>= 0.5.6)\cr
   Enhances: \tab rkward\cr License: \tab GPL (>= 3)\cr
   LazyLoad: \tab yes\cr URL: \tab http://rkward.sf.net\cr }
 

Modified: branches/external_plugins/rk.MultidimensionalScaling/ChangeLog
===================================================================
--- branches/external_plugins/rk.MultidimensionalScaling/ChangeLog	2013-04-14 07:08:54 UTC (rev 4697)
+++ branches/external_plugins/rk.MultidimensionalScaling/ChangeLog	2013-04-14 19:13:29 UTC (rev 4698)
@@ -1,5 +1,10 @@
 ChangeLog for package rk.MultidimensionalScaling
 
+changes in version 0.01-7 (2013-04-14)
+fixed:
+  - corrected logic section in main dialog
+    (distance calculation was not correctly enabled/disabled)
+
 changes in version 0.01-6 (2013-04-04)
 added:
   - debianized the plugin

Modified: branches/external_plugins/rk.MultidimensionalScaling/DESCRIPTION
===================================================================
--- branches/external_plugins/rk.MultidimensionalScaling/DESCRIPTION	2013-04-14 07:08:54 UTC (rev 4697)
+++ branches/external_plugins/rk.MultidimensionalScaling/DESCRIPTION	2013-04-14 19:13:29 UTC (rev 4698)
@@ -1,8 +1,8 @@
 Package: rk.MultidimensionalScaling
 Type: Package
 Title: RKWard GUI for multidimensional scaling
-Version: 0.01-6
-Date: 2013-04-04
+Version: 0.01-7
+Date: 2013-04-14
 Author: Meik Michalke <meik.michalke at hhu.de>
 Maintainer: Meik Michalke <meik.michalke at hhu.de>
 Depends:

Modified: branches/external_plugins/rk.MultidimensionalScaling/R/rk.MultidimensionalScaling-package.R
===================================================================
--- branches/external_plugins/rk.MultidimensionalScaling/R/rk.MultidimensionalScaling-package.R	2013-04-14 07:08:54 UTC (rev 4697)
+++ branches/external_plugins/rk.MultidimensionalScaling/R/rk.MultidimensionalScaling-package.R	2013-04-14 19:13:29 UTC (rev 4698)
@@ -3,8 +3,8 @@
 #' \tabular{ll}{
 #' Package: \tab rk.MultidimensionalScaling\cr
 #' Type: \tab Package\cr
-#' Version: \tab 0.01-6\cr
-#' Date: \tab 2013-04-04\cr
+#' Version: \tab 0.01-7\cr
+#' Date: \tab 2013-04-14\cr
 #' Depends: \tab  rkward (>= 0.5.6)\cr
 #' Enhances: \tab rkward\cr
 #' License: \tab GPL (>= 3)\cr

Modified: branches/external_plugins/rk.MultidimensionalScaling/debian/changelog
===================================================================
--- branches/external_plugins/rk.MultidimensionalScaling/debian/changelog	2013-04-14 07:08:54 UTC (rev 4697)
+++ branches/external_plugins/rk.MultidimensionalScaling/debian/changelog	2013-04-14 19:13:29 UTC (rev 4698)
@@ -1,3 +1,9 @@
+r-other-rkward-rk.multidimensionalscaling (0.01-7-1) unstable; urgency=low
+
+  * new upstream release
+
+ -- m.eik michalke <meik.michalke at hhu.de>  Sun, 14 Apr 2013 21:03:49 +0000
+
 r-other-rkward-rk.multidimensionalscaling (0.01-6-2) unstable; urgency=low
 
   * renamed package (keep the period in name)

Modified: branches/external_plugins/rk.MultidimensionalScaling/inst/CITATION
===================================================================
--- branches/external_plugins/rk.MultidimensionalScaling/inst/CITATION	2013-04-14 07:08:54 UTC (rev 4697)
+++ branches/external_plugins/rk.MultidimensionalScaling/inst/CITATION	2013-04-14 19:13:29 UTC (rev 4698)
@@ -2,12 +2,12 @@
 		title="rk.MultidimensionalScaling: RKWard GUI for multidimensional scaling",
 		author="Meik Michalke",
 		year="2013",
-		note="(Version 0.01-6)",
+		note="(Version 0.01-7)",
 		url="http://rkward.sf.net",
 
 		textVersion =
 		paste("Michalke, M. (2013). ",
-				"rk.MultidimensionalScaling: RKWard GUI for multidimensional scaling (Version 0.01-6). ",
+				"rk.MultidimensionalScaling: RKWard GUI for multidimensional scaling (Version 0.01-7). ",
 				"Available from http://rkward.sf.net",
 				sep=""),
 

Modified: branches/external_plugins/rk.MultidimensionalScaling/inst/NEWS.Rd
===================================================================
--- branches/external_plugins/rk.MultidimensionalScaling/inst/NEWS.Rd	2013-04-14 07:08:54 UTC (rev 4697)
+++ branches/external_plugins/rk.MultidimensionalScaling/inst/NEWS.Rd	2013-04-14 19:13:29 UTC (rev 4698)
@@ -1,5 +1,13 @@
 \name{NEWS}
 \title{News for Package 'rk.MultidimensionalScaling'}
+\section{Changes in rk.MultidimensionalScaling version 0.01-7 (2013-04-14)}{
+  \subsection{fixed}{
+    \itemize{
+      \item corrected logic section in main dialog
+        (distance calculation was not correctly enabled/disabled)
+    }
+  }
+}
 \section{Changes in rk.MultidimensionalScaling version 0.01-6 (2013-04-04)}{
   \subsection{added}{
     \itemize{

Modified: branches/external_plugins/rk.MultidimensionalScaling/inst/rkward/plugins/Multidimensionalscaling.xml
===================================================================
--- branches/external_plugins/rk.MultidimensionalScaling/inst/rkward/plugins/Multidimensionalscaling.xml	2013-04-14 07:08:54 UTC (rev 4697)
+++ branches/external_plugins/rk.MultidimensionalScaling/inst/rkward/plugins/Multidimensionalscaling.xml	2013-04-14 19:13:29 UTC (rev 4698)
@@ -33,8 +33,7 @@
 		<convert id="lgc_drpCmptt" sources="drp_Cmpttnmt.string" mode="equals" standard="minkowski" />
 		<connect governor="lgc_drpCmptt" client="spn_PwrfMnkw.enabled" />
 		<connect governor="chc_Pltrslts.state" client="row_cPPGTT08TT.enabled" />
-		<convert id="lgc_frmDtprp" sources="frm_Dtprprtn.enabled" mode="equals" standard="true" />
-		<connect governor="lgc_frmDtprp" client="frm_Dstncmtr.enabled" />
+		<connect governor="frm_Dtprprtn.enabled" client="frm_Dstncmtr.enabled" />
 		<set id="emb_rkwrdclrchsG.color.string" to="red" />
 	</logic>
 	<dialog label="Multidimensional scaling">

Modified: branches/external_plugins/rk.MultidimensionalScaling/inst/rkward/rk.MultidimensionalScaling.pluginmap
===================================================================
--- branches/external_plugins/rk.MultidimensionalScaling/inst/rkward/rk.MultidimensionalScaling.pluginmap	2013-04-14 07:08:54 UTC (rev 4697)
+++ branches/external_plugins/rk.MultidimensionalScaling/inst/rkward/rk.MultidimensionalScaling.pluginmap	2013-04-14 19:13:29 UTC (rev 4698)
@@ -15,8 +15,8 @@
 		name="rk.MultidimensionalScaling"
 		shortinfo="RKWard GUI for multidimensional scaling"
 		longinfo="RKWard GUI for multidimensional scaling"
-		version="0.01-6"
-		releasedate="2013-04-04"
+		version="0.01-7"
+		releasedate="2013-04-14"
 		url="http://rkward.sf.net"
 		license="GPL (>= 3)"
 	>

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	2013-04-14 07:08:54 UTC (rev 4697)
+++ branches/external_plugins/rk.MultidimensionalScaling/inst/rkward/rkwarddev_MDS_plugin_script.R	2013-04-14 19:13:29 UTC (rev 4698)
@@ -18,7 +18,7 @@
 		person(given="Meik", family="Michalke",
 			email="meik.michalke at hhu.de", role=c("aut","cre"))),
 	about=list(desc="RKWard GUI for multidimensional scaling",
-		version="0.01-6", url="http://rkward.sf.net")
+		version="0.01-7", url="http://rkward.sf.net")
 	)
 dependencies.info <- rk.XML.dependencies(
 	dependencies=list(rkward.min=ifelse(isTRUE(guess.getter), "0.6.0", "0.5.6")),
@@ -155,8 +155,7 @@
 		rk.XML.connect(governor=MDS.gov.dist, client=mds.spin.pwmink, set="enabled"),
 		rk.XML.connect(governor=mds.plot.cbox.plot, client=tab.mds.plot, set="enabled"),
 		# disable distance computation, if dist object given
-		gov.isntDistData <- rk.XML.convert(sources=list(enabled=mds.pre.frame), mode=c(equals="true")),
-		lgc.isntDistData <- rk.XML.connect(governor=gov.isntDistData, client=mds.frame.dist, set="enabled"),
+		lgc.isntDistData <- rk.XML.connect(governor=mds.pre.frame, get="enabled", client=mds.frame.dist, set="enabled"),
 		# set label text color to red
 		rk.XML.set(plot.text.color, set="color.string", to="red")
 	)

Modified: branches/external_plugins/rk.MultidimensionalScaling/man/rk.MultidimensionalScaling-package.Rd
===================================================================
--- branches/external_plugins/rk.MultidimensionalScaling/man/rk.MultidimensionalScaling-package.Rd	2013-04-14 07:08:54 UTC (rev 4697)
+++ branches/external_plugins/rk.MultidimensionalScaling/man/rk.MultidimensionalScaling-package.Rd	2013-04-14 19:13:29 UTC (rev 4698)
@@ -8,8 +8,8 @@
 }
 \details{
   \tabular{ll}{ Package: \tab rk.MultidimensionalScaling\cr
-  Type: \tab Package\cr Version: \tab 0.01-6\cr Date: \tab
-  2013-04-04\cr Depends: \tab rkward (>= 0.5.6)\cr
+  Type: \tab Package\cr Version: \tab 0.01-7\cr Date: \tab
+  2013-04-14\cr Depends: \tab rkward (>= 0.5.6)\cr
   Enhances: \tab rkward\cr License: \tab GPL (>= 3)\cr
   LazyLoad: \tab yes\cr URL: \tab http://rkward.sf.net\cr }
 





More information about the rkward-tracker mailing list