[q-lang-cvs] qcalc qcalc.q,1.213,1.214

[Albert G. <ag...@us...>]

Update of /cvsroot/q-lang/qcalc
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8546

Modified Files:
	qcalc.q 
Log Message:
bugfixes

Index: qcalc.q
===================================================================
RCS file: /cvsroot/q-lang/qcalc/qcalc.q,v
retrieving revision 1.213
retrieving revision 1.214
diff -C2 -d -r1.213 -r1.214
*** qcalc.q	4 Dec 2007 00:52:18 -0000	1.213
--- qcalc.q	4 Dec 2007 09:24:13 -0000	1.214
***************
*** 2328,2337 ****
    FROM = qt PRT "fromPage" (), TO = qt PRT "toPage" ()
  where ALL = selection_all, SEL = selection:
! 		= doprint PRT OPT_CONTENTS (FROM,TO) $
! 		  format_as_text OPT_CELLS (I1,J1;I2,J2)
  		    where (_,_;I1,J1;I2,J2) = SEL
  		    if qt PRT "printRange" () = PRINT_SEL;
! 		= doprint PRT OPT_CONTENTS (FROM,TO) $
! 		  format_as_text OPT_CELLS (I1,J1;I2,J2)
  		    where (_,_;I1,J1;I2,J2) = ALL;
  		= doprint PRT OPT_CONTENTS (FROM,TO) "";
--- 2328,2341 ----
    FROM = qt PRT "fromPage" (), TO = qt PRT "toPage" ()
  where ALL = selection_all, SEL = selection:
! 		= init_tmpfiles ||
! 		  doprint PRT OPT_CONTENTS (FROM,TO) $
! 		  format_as_text OPT_CELLS (I1,J1;I2,J2) ||
! 		  clear_tmpfiles
  		    where (_,_;I1,J1;I2,J2) = SEL
  		    if qt PRT "printRange" () = PRINT_SEL;
! 		= init_tmpfiles ||
! 		  doprint PRT OPT_CONTENTS (FROM,TO) $
! 		  format_as_text OPT_CELLS (I1,J1;I2,J2) ||
! 		  clear_tmpfiles
  		    where (_,_;I1,J1;I2,J2) = ALL;
  		= doprint PRT OPT_CONTENTS (FROM,TO) "";
***************
*** 2356,2363 ****
  
  mktmpname EXT	= TMPCTR := N+1 || sprintf "%s-%d.%s" (get TMPNAM,N,EXT)
! 		    where S:String = init_tmpfiles || get TMPNAM,
! 		      N:Int = get TMPCTR;
  
! init_tmpfiles	= clear_tmpfiles || TMPNAM := tmpnam || TMPCTR := 0;
  
  clear_tmpfiles	= do unlink (glob (S++"-[0-9]*.*")) ||
--- 2360,2366 ----
  
  mktmpname EXT	= TMPCTR := N+1 || sprintf "%s-%d.%s" (get TMPNAM,N,EXT)
! 		    where S:String = get TMPNAM, N:Int = get TMPCTR;
  
! init_tmpfiles	= TMPNAM := tmpnam || TMPCTR := 0;
  
  clear_tmpfiles	= do unlink (glob (S++"-[0-9]*.*")) ||
***************
*** 2377,2381 ****
  		  CONTENTS (FROM,TO) 1 (1,1) ||
  		  qt P "end" () ||
- 		  clear_tmpfiles ||
  		  statusmsg "Done"
  		    where M = qt_new "QPaintDeviceMetrics" $ qt P "device" (),
--- 2380,2383 ----
***************
*** 2600,2604 ****
  format_text (I,J) S
  if not is_nil X where X:QtObject = gui_elem (I,J):
! 		= (S,true) if gui_hasrichtext ();
  		= (make_gnuplot (W,H) S,true)
  		    where S:String = drop (P+1) S,
--- 2602,2606 ----
  format_text (I,J) S
  if not is_nil X where X:QtObject = gui_elem (I,J):
! 		= (S,true) if gui_hasrichtext X;
  		= (make_gnuplot (W,H) S,true)
  		    where S:String = drop (P+1) S,
***************
*** 2613,2617 ****
  		= fprintf PLOT "set terminal png size %d, %d; \
  set output '%s'\n" (W,H,TMP) ||
! 		  fprintf PLOT "%s\n" CMD ||
  		  sprintf "<img src=\"%s\">" (htmlquote TMP)
  		    where PLOT:File = popen "gnuplot" "w",
--- 2615,2619 ----
  		= fprintf PLOT "set terminal png size %d, %d; \
  set output '%s'\n" (W,H,TMP) ||
! 		  fputs PLOT CMD ||
  		  sprintf "<img src=\"%s\">" (htmlquote TMP)
  		    where PLOT:File = popen "gnuplot" "w",