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

[tfry at users.sourceforge.net]

Revision: 3216
          http://rkward.svn.sourceforge.net/rkward/?rev=3216&view=rev
Author:   tfry
Date:     2010-11-25 10:18:20 +0000 (Thu, 25 Nov 2010)

Log Message:
-----------
Fix validity for saveobject choosers

Modified Paths:
--------------
    trunk/rkward/ChangeLog
    trunk/rkward/rkward/plugin/rkcomponent.cpp
    trunk/rkward/rkward/plugin/rkpluginsaveobject.cpp
    trunk/rkward/rkward/plugins/uni1.2/description.xml
    trunk/rkward/rkward/rkconsole.cpp

Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog	2010-11-25 10:16:44 UTC (rev 3215)
+++ trunk/rkward/ChangeLog	2010-11-25 10:18:20 UTC (rev 3216)
@@ -1,3 +1,4 @@
+- Fixed: Submit button would not become enabled in "Basic Statistics" plugin
 - Moved automated testing framework moved to a dedicated R package "rkwardtests", and added documentation
 - Support pasting to the middle of the current command line in the R Console
 - Better handling of script-editor commands while the R Console is busy

Modified: trunk/rkward/rkward/plugin/rkcomponent.cpp
===================================================================
--- trunk/rkward/rkward/plugin/rkcomponent.cpp	2010-11-25 10:16:44 UTC (rev 3215)
+++ trunk/rkward/rkward/plugin/rkcomponent.cpp	2010-11-25 10:18:20 UTC (rev 3216)
@@ -149,6 +149,7 @@
 	RK_TRACE (PLUGIN);
 	if (!required) return true;
 	if (isValid ()) return true;
+ 	if (isComponent ()) RK_DO (qDebug ("component not satisfied: %s", qPrintable (static_cast<RKComponent*> (this)->getIdInParent ())), PLUGIN, DL_DEBUG);
 	return false;		// never happens in RKComponentBase, but might in subclasses
 }
 

Modified: trunk/rkward/rkward/plugin/rkpluginsaveobject.cpp
===================================================================
--- trunk/rkward/rkward/plugin/rkpluginsaveobject.cpp	2010-11-25 10:16:44 UTC (rev 3215)
+++ trunk/rkward/rkward/plugin/rkpluginsaveobject.cpp	2010-11-25 10:18:20 UTC (rev 3216)
@@ -121,6 +121,7 @@
 bool RKPluginSaveObject::isValid () {
 	RK_TRACE (PLUGIN);
 
+	if (groupbox->isCheckable () && (!groupbox->isChecked ())) return true;
 	return (RKComponent::isValid () && selector->isOk ());
 }
 

Modified: trunk/rkward/rkward/plugins/uni1.2/description.xml
===================================================================
--- trunk/rkward/rkward/plugins/uni1.2/description.xml	2010-11-25 10:16:44 UTC (rev 3215)
+++ trunk/rkward/rkward/plugins/uni1.2/description.xml	2010-11-25 10:18:20 UTC (rev 3216)
@@ -109,7 +109,7 @@
 			</tab>
 			<tab id="option" label="Options" >
 				<checkbox value_unchecked="0" checked="true" value="1" id="narm" label="Omit missing values" />
-				<saveobject intial="rk.univariate" id="saveas" checkable="true" label="Store results" />
+				<saveobject initial="rk.univariate" id="saveas" checkable="true" label="Store results" />
 				<stretch/>
 			</tab>
 		</tabbook>

Modified: trunk/rkward/rkward/rkconsole.cpp
===================================================================
--- trunk/rkward/rkward/rkconsole.cpp	2010-11-25 10:16:44 UTC (rev 3215)
+++ trunk/rkward/rkward/rkconsole.cpp	2010-11-25 10:18:20 UTC (rev 3216)
@@ -559,11 +559,14 @@
 		} else {
 			input_buffer.clear ();
 		}
+	} else {
+		RK_ASSERT (!command.endsWith ('\n'));
+		command.append ('\n');
 	}
+
 	current_command_displayed_up_to = incomplete_command.length ();
 	setCurrentEditingLine (command.mid (current_command_displayed_up_to, command.indexOf ('\n', current_command_displayed_up_to) - current_command_displayed_up_to));
 	current_command_displayed_up_to += currentEditingLine ().length ();
-
 	skip_command_display_lines = incomplete_command.count ('\n') + 1;	// incomplete command, and first line have already been shown.
 
 	doc->insertLine (doc->lines (), QString ());


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