[rkward-cvs] rkward/rkward/rbackend Makefile.am,1.8,1.9 rinterface.cpp,1.28,1.29 rthread.cpp,1.18,1.19 rembed.cpp,1.23,NONE rembed.h,1.10,NONE

[Thomas Friedrichsmeier]

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

Modified Files:
	Makefile.am rinterface.cpp rthread.cpp 
Removed Files:
	rembed.cpp rembed.h 
Log Message:
Removing obsoleted rembed-, and rktogglewidget-files.

Index: rinterface.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rbackend/rinterface.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** rinterface.cpp	23 Sep 2005 17:19:30 -0000	1.28
--- rinterface.cpp	25 Sep 2005 18:45:44 -0000	1.29
***************
*** 21,25 ****
  #include "rthread.h"
  #include "rcommandstack.h"
- #include "rembed.h"
  #include "../rkward.h"
  #include "../settings/rksettingsmoduler.h"
--- 21,24 ----
***************
*** 91,95 ****
  	r_thread->start ();
  
! 	watch = new RKwatch (this);
  }
  
--- 90,94 ----
  	r_thread->start ();
  
! 	watch = new RKwatch ();
  }
  

Index: Makefile.am
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rbackend/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile.am	4 May 2005 15:23:02 -0000	1.8
--- Makefile.am	25 Sep 2005 18:45:44 -0000	1.9
***************
*** 3,9 ****
  
  noinst_LIBRARIES =  librbackend.a
! librbackend_a_SOURCES = rembed.cpp rembedinternal.cpp rinterface.cpp rthread.cpp rcommand.cpp rcommandstack.cpp \
  rkwindowcatcher.cpp
! noinst_HEADERS = rembed.h rembedinternal.h rinterface.h rthread.h rcommand.h rcommandreceiver.h rcommandstack.h \
  rkwindowcatcher.h
  SUBDIRS =  rpackages
--- 3,9 ----
  
  noinst_LIBRARIES =  librbackend.a
! librbackend_a_SOURCES = rembedinternal.cpp rinterface.cpp rthread.cpp rcommand.cpp rcommandstack.cpp \
  rkwindowcatcher.cpp
! noinst_HEADERS = rembedinternal.h rinterface.h rthread.h rcommand.h rcommandreceiver.h rcommandstack.h \
  rkwindowcatcher.h
  SUBDIRS =  rpackages

Index: rthread.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rbackend/rthread.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** rthread.cpp	23 Sep 2005 17:19:30 -0000	1.18
--- rthread.cpp	25 Sep 2005 18:45:44 -0000	1.19
***************
*** 17,21 ****
  #include "rthread.h"
  
- #include "rembed.h"
  #include "rinterface.h"
  #include "rcommandstack.h"
--- 17,20 ----
***************
*** 184,189 ****
  	RK_TRACE (RBACKEND);
  
  	if (!buf_length) return;
- 	if (!current_command) return;
  
  	ROutput *out = new ROutput;
--- 183,189 ----
  	RK_TRACE (RBACKEND);
  
+ // TODO: output sometimes arrives in small chunks. Maybe it would be better to keep an internal buffer, and only append it to the output, when R_FlushConsole gets called?
+ 
  	if (!buf_length) return;
  
  	ROutput *out = new ROutput;
***************
*** 213,217 ****
  
  	if (!call_length) return;
- 	if (!current_command) return;
  
  	// Unfortunately, errors still get printed to the output. We try this crude method for the time being:
--- 213,216 ----
***************
*** 300,303 ****
--- 299,306 ----
  int RThread::initialize () {
  	RK_TRACE (RBACKEND);
+ 
+ 	// we create a fake RCommand to capture all the output/errors during startup
+ 	current_command = new RCommand ("", RCommand::App, "R Startup");
+ 
  	QString r_home = RKSettingsModuleR::rHomeDir();
  
***************
*** 342,345 ****
--- 345,352 ----
  	// TODO: error-handling?
  
+ 	QCustomEvent *event = new QCustomEvent (RCOMMAND_OUT_EVENT);
+ 	event->setData (current_command);
+ 	qApp->postEvent (inter, event);
+ 
  	return status;
  }

--- rembed.cpp DELETED ---

--- rembed.h DELETED ---