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

[tfry at users.sourceforge.net]

Revision: 822
          http://svn.sourceforge.net/rkward/?rev=822&view=rev
Author:   tfry
Date:     2006-10-06 05:04:53 -0700 (Fri, 06 Oct 2006)

Log Message:
-----------
assorted small fixes

Modified Paths:
--------------
    trunk/rkward/rkward/khelpdlg.cpp
    trunk/rkward/rkward/plugins/simple_anova/code.php
    trunk/rkward/rkward/rbackend/rthread.cpp

Modified: trunk/rkward/rkward/khelpdlg.cpp
===================================================================
--- trunk/rkward/rkward/khelpdlg.cpp	2006-10-05 23:34:08 UTC (rev 821)
+++ trunk/rkward/rkward/khelpdlg.cpp	2006-10-06 12:04:53 UTC (rev 822)
@@ -204,8 +204,8 @@
 			KMessageBox::sorry (this, i18n ("No help found on '%1'. Maybe the corresponding package is not installed/loaded, or maybe you mistyped the command. Try using Help->Search R Help for more options.").arg (command->command ().section ("\"", 1, 1)), i18n ("No help found"));
 		}
 	} else if (command->getFlags () == GET_INSTALLED_PACKAGES) {
-		RK_ASSERT ((command->getDataLength () % 4) == 0);
-		unsigned int count = (command->getDataLength () / 4);
+		RK_ASSERT (command->getDataType () == RData::StringVector);
+		unsigned int count = command->getDataLength ();
 		for (unsigned int i=0; i < count; ++i) {
 			packagesList->insertItem (command->getStringVector ()[i]);
 		}

Modified: trunk/rkward/rkward/plugins/simple_anova/code.php
===================================================================
--- trunk/rkward/rkward/plugins/simple_anova/code.php	2006-10-05 23:34:08 UTC (rev 821)
+++ trunk/rkward/rkward/plugins/simple_anova/code.php	2006-10-06 12:04:53 UTC (rev 822)
@@ -3,9 +3,10 @@
 	}
 	
 	function calculate () {
-?>rk.temp.glm = glm (<? getRK ("model"); ?>, data=<? getRK ("model.data"); ?>)
+?>rk.temp.glm = glm (<? getRK ("model"); ?>, data=<? getRK ("model.table"); ?>)
 rk.temp.labels = <? getRK ("model.labels"); ?> 
-rk.temp.anova = anova (rk.temp.glm)<?
+rk.temp.anova = anova (rk.temp.glm)
+<?
 	}
 	
 	function printout () {

Modified: trunk/rkward/rkward/rbackend/rthread.cpp
===================================================================
--- trunk/rkward/rkward/rbackend/rthread.cpp	2006-10-05 23:34:08 UTC (rev 821)
+++ trunk/rkward/rkward/rbackend/rthread.cpp	2006-10-06 12:04:53 UTC (rev 822)
@@ -314,7 +314,10 @@
 
 	if (call_length == 2) {		// schedule symbol update for later
 		if (call[0] == "ws") {
-			if (!changed_symbol_names.contains (call[1])) changed_symbol_names.append (call[1]);
+			RK_ASSERT (current_command);
+			if ((current_command->type () & RCommand::ObjectListUpdate) || (!current_command->type () & RCommand::Sync)) {		// ignore Sync commands that are not flagged as ObjectListUpdate
+				if (!changed_symbol_names.contains (call[1])) changed_symbol_names.append (call[1]);
+			}
 			return;
 		}
 	}
@@ -523,6 +526,7 @@
 		RK_DO (qDebug ("checkObjectUpdatesNeeded: updating watches"), RBACKEND, DL_TRACE);
 		runCommandInternal (".rk.watch.globalenv ()\n", &error);
 	} else {
+		// TODO: maybe this has to be done outside the parent if: We may want to also check wether the modified objects are opened, and, if so, update their data
 		if (!changed_symbol_names.isEmpty ()) {
 			QStringList *copy = new QStringList (changed_symbol_names);
 			QCustomEvent *event = new QCustomEvent (RINDIVIDUAL_SYMBOLS_CHANGED_EVENT);


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