Update of /cvsroot/q-lang/qcalc
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15785
Modified Files:
qcalc.q
Log Message:
bugfix: automatically abort a running computation when the main window gets closed
Index: qcalc.q
===================================================================
RCS file: /cvsroot/q-lang/qcalc/qcalc.q,v
retrieving revision 1.204
retrieving revision 1.205
diff -C2 -d -r1.204 -r1.205
*** qcalc.q 30 Nov 2007 13:20:49 -0000 1.204
--- qcalc.q 30 Nov 2007 13:42:15 -0000 1.205
***************
*** 708,711 ****
--- 708,715 ----
def ABORTED = ref false;
+ check_aborted = true if get ABORTED;
+ = ABORTED := true || true if qt MAIN "isHidden" ();
+ = false otherwise;
+
begin_compute = ABORTED := false;
end_compute = ABORTED := false || normal_cursor;
***************
*** 1014,1018 ****
// No output yet, take a short nap and try again.
= startup_loop (H,PID,MASTER)
! if local (qt APP "processEvents" 100) || not get ABORTED;
// User aborted compilation, bail out.
= fini_interp || statusmsg "Compilation aborted" || false;
--- 1018,1022 ----
// No output yet, take a short nap and try again.
= startup_loop (H,PID,MASTER)
! if local (qt APP "processEvents" 100) || not check_aborted;
// User aborted compilation, bail out.
= fini_interp || statusmsg "Compilation aborted" || false;
***************
*** 3758,3762 ****
= () otherwise;
results_loop T0 U [(I,J)|V]
! if get ABORTED:
// user aborted the computation, flag all remaining cells
= do flag [(I,J)|V];
--- 3762,3766 ----
= () otherwise;
results_loop T0 U [(I,J)|V]
! if check_aborted:
// user aborted the computation, flag all remaining cells
= do flag [(I,J)|V];
***************
*** 3882,3886 ****
end_recursive ||
local (qt APP "processEvents" 100) ||
! begin_recursive || get ABORTED;
= results_loop T0 U [(I,J)|V] otherwise;
--- 3886,3890 ----
end_recursive ||
local (qt APP "processEvents" 100) ||
! begin_recursive || check_aborted;
= results_loop T0 U [(I,J)|V] otherwise;
|
