[q-lang-cvs] qcalc qcalc.q,1.107,1.108
Brought to you by:
agraef
Menu
▾
▴
[q-lang-cvs] qcalc qcalc.q,1.107,1.108
|
From: Albert G. <ag...@us...> - 2007-11-07 21:41:49
|
Update of /cvsroot/q-lang/qcalc In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10422 Modified Files: qcalc.q Log Message: code cleanup Index: qcalc.q =================================================================== RCS file: /cvsroot/q-lang/qcalc/qcalc.q,v retrieving revision 1.107 retrieving revision 1.108 diff -C2 -d -r1.107 -r1.108 *** qcalc.q 7 Nov 2007 10:04:26 -0000 1.107 --- qcalc.q 7 Nov 2007 21:41:42 -0000 1.108 *************** *** 589,595 **** def LASTW = ref []; ! check_lastW (I,J,X:QtObject) = doprocess (I,J) ! if is_nil (qt TABLE "cellWidget" (I,J)); /* Timer processing. */ --- 589,595 ---- def LASTW = ref []; ! check_lastW (I,J,IT:QtObject) = doprocess (I,J) ! if is_nil X where X:QtObject = gui_elem (I,J); /* Timer processing. */ *************** *** 678,682 **** process_update (I,J) S ! = gui_setval X S || X where X:QtObject = get CELLS!(I,J); = if null S0 then delete_cells (I,J) else insert_cells ((I,J),S0) || S0 --- 678,682 ---- process_update (I,J) S ! = gui_setval X S || X where X:QtObject = gui_elem (I,J); = if null S0 then delete_cells (I,J) else insert_cells ((I,J),S0) || S0 *************** *** 686,690 **** process_update2 (I,J) S ! = gui_setval X S || X where X:QtObject = get CELLS!(I,J); = if null S0 then delete_cells (I,J) else insert_cells ((I,J),S0) || --- 686,690 ---- process_update2 (I,J) S ! = gui_setval X S || X where X:QtObject = gui_elem (I,J); = if null S0 then delete_cells (I,J) else insert_cells ((I,J),S0) || *************** *** 800,803 **** --- 800,817 ---- /* Some convenience functions for accessing the table. */ + is_empty (I,J) = false if member (get EVAL) (I,J); + = false if is_gui_elem (I,J); + = null S where S:String = qt TABLE "text" (I,J); + = true otherwise; + + is_gui_elem (I,J) + = true where _:QtObject = get CELLS!(I,J); + = false otherwise; + + gui_elem (I,J) + where IT:QtObject = get CELLS!(I,J): + = X where X:QtObject = qt_data IT; + = IT otherwise; + current_edited = (qt TABLE "currEditRow" (),qt TABLE "currEditCol" ()) if qt TABLE "isEditing" (); *************** *** 822,826 **** if global and then not get REDIT: = process_gui (I,J) X || digest_loop ! where X:QtObject = get CELLS!(I,J); = finish_edit true (I,J); --- 836,840 ---- if global and then not get REDIT: = process_gui (I,J) X || digest_loop ! where X:QtObject = gui_elem (I,J); = finish_edit true (I,J); *************** *** 877,881 **** if global and then (qt TABW "currentPageIndex" () = 0): = gui_enter (I,J) X ! where X:QtObject = get CELLS!(I,J); = accept S D A || qt TABLE "setCurrentCell" --- 891,895 ---- if global and then (qt TABW "currentPageIndex" () = 0): = gui_enter (I,J) X ! where X:QtObject = gui_elem (I,J); = accept S D A || qt TABLE "setCurrentCell" *************** *** 1445,1449 **** sel_cellcvals ()= []; sel_cval (I,J) ! where X:QtObject = get CELLS!(I,J): = str B where B:Bool = qt X "isChecked" (); = str B if not qt X "isToggleButton" () --- 1459,1463 ---- sel_cellcvals ()= []; sel_cval (I,J) ! where X:QtObject = gui_elem (I,J): = str B where B:Bool = qt X "isChecked" (); = str B if not qt X "isToggleButton" () *************** *** 2505,2509 **** cellval (I,J) ! where X:QtObject = get CELLS!(I,J): // these values come from the GUI elements in the table = 'Y where Y = gui_getval X; --- 2519,2523 ---- cellval (I,J) ! where X:QtObject = gui_elem (I,J): // these values come from the GUI elements in the table = 'Y where Y = gui_getval X; *************** *** 2588,2592 **** = qt TABLE "setItem" (I1,J1,IT) || qt TABLE "setCellWidget" (I1,J1,X) || ! insert_cells ((I1,J1),X) || collect_results (insert U ((I1,J1),X)) [(I,J)|V] where [(K1,S1)] = regex "" --- 2602,2606 ---- = qt TABLE "setItem" (I1,J1,IT) || qt TABLE "setCellWidget" (I1,J1,X) || ! insert_cells ((I1,J1),IT) || collect_results (insert U ((I1,J1),X)) [(I,J)|V] where [(K1,S1)] = regex "" *************** *** 2594,2599 **** (reg 1,reg 2), (I1,J1) = val K1, (TEXT,ICON) = val S1, - IT = qt_new "QTableItem" - (TABLE,qt_val "QTableItem" "Never"), ICONSET = if null ICON then () --- 2608,2611 ---- *************** *** 2606,2617 **** // slots [("guiUpdate()",gui_update)] [], _ = qt_connect X (SIGNAL "pressed()") X (SLOT "guiUpdate()") || qt_connect X (SIGNAL "released()") ! X (SLOT "guiUpdate()"); = qt X "setToggleButton" true || qt TABLE "setItem" (I1,J1,IT) || qt TABLE "setCellWidget" (I1,J1,X) || ! insert_cells ((I1,J1),X) || collect_results (insert U ((I1,J1),X)) [(I,J)|V] where [(K1,S1)] = regex "" --- 2618,2633 ---- // slots [("guiUpdate()",gui_update)] [], + IT = qt_object "QTableItem" + (TABLE,qt_val "QTableItem" "Never") + "MyTableItem" X [] [] [], _ = qt_connect X (SIGNAL "pressed()") X (SLOT "guiUpdate()") || qt_connect X (SIGNAL "released()") ! X (SLOT "guiUpdate()") || ! qt IT "setReplaceable" false; = qt X "setToggleButton" true || qt TABLE "setItem" (I1,J1,IT) || qt TABLE "setCellWidget" (I1,J1,X) || ! insert_cells ((I1,J1),IT) || collect_results (insert U ((I1,J1),X)) [(I,J)|V] where [(K1,S1)] = regex "" *************** *** 2619,2624 **** (reg 1,reg 2), (I1,J1) = val K1, (TEXT,ICON) = val S1, - IT = qt_new "QTableItem" - (TABLE,qt_val "QTableItem" "Never"), ICONSET = if null ICON then () --- 2635,2638 ---- *************** *** 2631,2638 **** // slots [("guiUpdate()",gui_update)] [], _ = qt_connect X (SIGNAL "toggled(bool)") X (SLOT "guiUpdate()") || qt_connect X (SIGNAL "released()") ! X (SLOT "guiUpdate()"); = recursive (qt IT "setCurrentItem" INIT) || qt TABLE "setItem" (I1,J1,IT) || --- 2645,2656 ---- // slots [("guiUpdate()",gui_update)] [], + IT = qt_object "QTableItem" + (TABLE,qt_val "QTableItem" "Never") + "MyTableItem" X [] [] [], _ = qt_connect X (SIGNAL "toggled(bool)") X (SLOT "guiUpdate()") || qt_connect X (SIGNAL "released()") ! X (SLOT "guiUpdate()") || ! qt IT "setReplaceable" false; = recursive (qt IT "setCurrentItem" INIT) || qt TABLE "setItem" (I1,J1,IT) || *************** *** 2663,2667 **** qt TABLE "setItem" (I1,J1,IT) || qt TABLE "setCellWidget" (I1,J1,X) || ! insert_cells ((I1,J1),X) || collect_results (insert U ((I1,J1),X)) [(I,J)|V] where [(K1,S1)] = regex "" --- 2681,2685 ---- qt TABLE "setItem" (I1,J1,IT) || qt TABLE "setCellWidget" (I1,J1,X) || ! insert_cells ((I1,J1),IT) || collect_results (insert U ((I1,J1),X)) [(I,J)|V] where [(K1,S1)] = regex "" *************** *** 2670,2675 **** (I1,J1) = val K1, (MIN,MAX,STEP,INIT,SPECIAL,PREF,SUFF,V2T,T2V) = val S1, - IT = qt_new "QTableItem" - (TABLE,qt_val "QTableItem" "Never"), X = qt_object "QSpinBox" (MIN,MAX,STEP,TABLE) "MySpinBox" (I1,J1) --- 2688,2691 ---- *************** *** 2678,2690 **** // slots [("guiUpdate()",gui_update)] [], _ = qt_connect X (SIGNAL "valueChanged(int)") X (SLOT "guiUpdate()") || // FIXME: implement more appropriate validation here // currently we just switch it off ! qt X "setValidator" nil; = recursive (qt X "setLineStep" LSTEP) || qt TABLE "setItem" (I1,J1,IT) || qt TABLE "setCellWidget" (I1,J1,X) || ! insert_cells ((I1,J1),X) || collect_results (insert U ((I1,J1),X)) [(I,J)|V] where [(K1,S1)] = regex "" --- 2694,2710 ---- // slots [("guiUpdate()",gui_update)] [], + IT = qt_object "QTableItem" + (TABLE,qt_val "QTableItem" "Never") + "MyTableItem" X [] [] [], _ = qt_connect X (SIGNAL "valueChanged(int)") X (SLOT "guiUpdate()") || // FIXME: implement more appropriate validation here // currently we just switch it off ! qt X "setValidator" nil || ! qt IT "setReplaceable" false; = recursive (qt X "setLineStep" LSTEP) || qt TABLE "setItem" (I1,J1,IT) || qt TABLE "setCellWidget" (I1,J1,X) || ! insert_cells ((I1,J1),IT) || collect_results (insert U ((I1,J1),X)) [(I,J)|V] where [(K1,S1)] = regex "" *************** *** 2693,2698 **** (I1,J1) = val K1, (MIN,MAX,STEP,INIT,VERT) = val S1, - IT = qt_new "QTableItem" - (TABLE,qt_val "QTableItem" "Never"), X = qt_object "QSlider" (MIN,MAX,STEP,INIT, --- 2713,2716 ---- *************** *** 2702,2707 **** // slots [("guiUpdate()",gui_update)] [], _ = qt_connect X (SIGNAL "valueChanged(int)") ! X (SLOT "guiUpdate()"); // anything else just gets passed to the digest function, and we try again = begin_local || digest S || end_local || --- 2720,2729 ---- // slots [("guiUpdate()",gui_update)] [], + IT = qt_object "QTableItem" + (TABLE,qt_val "QTableItem" "Never") + "MyTableItem" X [] [] [], _ = qt_connect X (SIGNAL "valueChanged(int)") ! X (SLOT "guiUpdate()") || ! qt IT "setReplaceable" false; // anything else just gets passed to the digest function, and we try again = begin_local || digest S || end_local || *************** *** 2805,2817 **** /* Process cell values after edits or after loading a new file. */ - is_empty (I,J) = false if member (get EVAL) (I,J); - = false where _:QtObject = get CELLS!(I,J); - = null S where S:String = qt TABLE "text" (I,J); - = true otherwise; - - is_gui_elem (I,J) - = true where _:QtObject = get CELLS!(I,J); - = false otherwise; - process_all = do flag U || compute_all V where (V,U) = eval_list --- 2827,2830 ---- |
