[rkward-cvs] SF.net SVN: rkward-code:[4590] trunk/rkward/rkward

[tfry at users.sf.net]

Revision: 4590
          http://sourceforge.net/p/rkward/code/4590
Author:   tfry
Date:     2013-03-13 18:30:14 +0000 (Wed, 13 Mar 2013)
Log Message:
-----------
Fix <switch> change notification

Modified Paths:
--------------
    trunk/rkward/rkward/plugin/rkcomponentproperties.cpp
    trunk/rkward/rkward/plugins/rkwarddev_scripts/subset_dataframe.R

Modified: trunk/rkward/rkward/plugin/rkcomponentproperties.cpp
===================================================================
--- trunk/rkward/rkward/plugin/rkcomponentproperties.cpp	2013-03-13 16:19:33 UTC (rev 4589)
+++ trunk/rkward/rkward/plugin/rkcomponentproperties.cpp	2013-03-13 18:30:14 UTC (rev 4590)
@@ -1360,7 +1360,11 @@
 	RK_ASSERT (!condition_prop);	// must only be called once
 
 	condition_prop = c_parent->lookupProperty (_condition_prop, &condition_prop_modifier, true);
-	if (!condition_prop) RK_DEBUG (PLUGIN, DL_ERROR, "Not a valid condition to connect <switch> property to: %s", qPrintable (_condition_prop));
+	if (!condition_prop) {
+		RK_DEBUG (PLUGIN, DL_ERROR, "Not a valid condition to connect <switch> property to: %s", qPrintable (_condition_prop));
+	} else {
+		connect (condition_prop, SIGNAL (valueChanged(RKComponentPropertyBase*)), this, SLOT (sourcePropertyChanged(RKComponentPropertyBase*)));
+	}
 
 	for (int i = 0; i < _value_props.size (); ++i) {
 		QString mod;

Modified: trunk/rkward/rkward/plugins/rkwarddev_scripts/subset_dataframe.R
===================================================================
--- trunk/rkward/rkward/plugins/rkwarddev_scripts/subset_dataframe.R	2013-03-13 16:19:33 UTC (rev 4589)
+++ trunk/rkward/rkward/plugins/rkwarddev_scripts/subset_dataframe.R	2013-03-13 18:30:14 UTC (rev 4590)
@@ -146,8 +146,8 @@
 		rk.XML.external(id="case_filter_data_mode", "any"),
 		lgc.drop.switch,
 		lgc.is.range,
-# TODO: Why doesn't this work?
-#		rk.XML.connect(governor=lgc.is.range, client=sset.range.options, set="visible"),
+		rk.XML.connect(governor=lgc.is.range, client=sset.range.options, set="visible"),
+# TODO: rkwarddev does not accept "visible.not" as modifier
 		rk.XML.connect(governor=sset.range.options, get="visible.not", client=sset.input.filter, set="visible"),
 		rk.XML.connect(governor=sset.have.filter.var, client=sset.input.filter, set="required")
 	)