[rkward-cvs] rkward/rkward/rbackend rthread.cpp,1.20,1.21

[Thomas Friedrichsmeier]

Update of /cvsroot/rkward/rkward/rkward/rbackend
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6910/rkward/rbackend

Modified Files:
	rthread.cpp 
Log Message:
Add GUI for most important R options in Settings->R backend

Index: rthread.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rbackend/rthread.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** rthread.cpp	29 Sep 2005 16:02:51 -0000	1.20
--- rthread.cpp	12 Oct 2005 17:02:33 -0000	1.21
***************
*** 305,317 ****
  	QString r_home = RKSettingsModuleR::rHomeDir();
  
! 	QStringList arglist = RKSettingsModuleR::getOptionList();
! 	char *argv[arglist.count ()];
! 	int argc = 0;
! 	QStringList::iterator it;
! 	for (it = arglist.begin (); it != arglist.end (); ++it) {
! 		argv[argc] = qstrdup ((*it).latin1 ());
! 		argc++;
! 	}
! 	
  	startR (r_home, argc, argv);
  
--- 305,311 ----
  	QString r_home = RKSettingsModuleR::rHomeDir();
  
! 	int argc = 2;	
! 	char* argv[2] = { qstrdup ("--slave"), qstrdup ("--no-save") };
! 
  	startR (r_home, argc, argv);
  
***************
*** 327,340 ****
  	runCommandInternal ("library (\"rkward\")\n", &error);
  	if (error) status |= LibLoadFail;
! 	QStringList list = RKSettingsModuleR::getPackageRepositories ();
! 	QString command = "options (repos=c(";
! 	for (QStringList::const_iterator it = list.begin (); it != list.end (); ++it) {
! 		if (it != list.begin ()) {
! 			command.append (", ");
! 		}
! 		command.append ("\"" + *it + "\"");
  	}
- 	runCommandInternal (command + "))\n", &error);
- 	if (error) status |= OtherFail;
  	runCommandInternal ("options (error=quote (.rk.do.error ()))\n", &error);
  	if (error) status |= SinkFail;
--- 321,329 ----
  	runCommandInternal ("library (\"rkward\")\n", &error);
  	if (error) status |= LibLoadFail;
! 	QStringList commands = RKSettingsModuleR::makeRRunTimeOptionCommands ();
! 	for (QStringList::const_iterator it = commands.begin (); it != commands.end (); ++it) {
! 		runCommandInternal (*it, &error);
! 		if (error) status |= OtherFail;
  	}
  	runCommandInternal ("options (error=quote (.rk.do.error ()))\n", &error);
  	if (error) status |= SinkFail;