Update of /cvsroot/easycalc/easycalc
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv19764
Modified Files:
finance.c solver.c varmgr.c
Log Message:
Replace calls to FrmAlert(altCompute) ("Error while computing") with call to
alertErrorMessage() stating the real error where possible.
Index: finance.c
===================================================================
RCS file: /cvsroot/easycalc/easycalc/finance.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** finance.c 12 Sep 2006 19:40:55 -0000 1.14
--- finance.c 16 Sep 2006 23:30:58 -0000 1.15
***************
*** 73,77 ****
"PYR=fzero(1E-1:366:\"fv-fin_fv(I:N:PV:PMT:x:1)\":1E-6",
"PYR=fzero(1E-1:366:\"fv-fin_fv(I:N:PV:PMT:x:0\":1E-6"},
! {0,0,NULL,NULL}
};
--- 73,77 ----
"PYR=fzero(1E-1:366:\"fv-fin_fv(I:N:PV:PMT:x:1)\":1E-6",
"PYR=fzero(1E-1:366:\"fv-fin_fv(I:N:PV:PMT:x:0\":1E-6"},
! {0,0,NULL,NULL}
};
***************
*** 100,107 ****
for (i=0;inpFinForm[i].var!=NULL;i++) {
item = db_read_variable(inpFinForm[i].var,&err);
! if (err || item.type!=real)
! SysCopyStringResource(text,strUndefined);
! else
! fp_print_double(text,item.u.realval);
if (!err)
rpn_delete(item);
--- 100,107 ----
for (i=0;inpFinForm[i].var!=NULL;i++) {
item = db_read_variable(inpFinForm[i].var,&err);
! if (err || item.type!=real)
! SysCopyStringResource(text,strUndefined);
! else
! fp_print_double(text,item.u.realval);
if (!err)
rpn_delete(item);
***************
*** 136,140 ****
if (err)
! return;
wait_draw();
--- 136,140 ----
if (err)
! return;
wait_draw();
***************
*** 144,148 ****
if (err)
! FrmAlert(altCompute);
FrmUpdateForm(finForm,frmUpdateVars);
--- 144,148 ----
if (err)
! alertErrorMessage(err);
FrmUpdateForm(finForm,frmUpdateVars);
Index: solver.c
===================================================================
RCS file: /cvsroot/easycalc/easycalc/solver.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** solver.c 12 Sep 2006 19:40:55 -0000 1.13
--- solver.c 16 Sep 2006 23:30:58 -0000 1.14
***************
*** 418,422 ****
FrmUpdateForm(slvForm,frmUpdateVars);
else
! FrmAlert(altCompute);
}
--- 418,422 ----
FrmUpdateForm(slvForm,frmUpdateVars);
else
! alertErrorMessage(err);
}
***************
*** 468,472 ****
}
if (err)
! FrmAlert(altCompute);
}
--- 468,472 ----
}
if (err)
! alertErrorMessage(err);
}
Index: varmgr.c
===================================================================
RCS file: /cvsroot/easycalc/easycalc/varmgr.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** varmgr.c 12 Sep 2006 19:40:55 -0000 1.22
--- varmgr.c 16 Sep 2006 23:30:58 -0000 1.23
***************
*** 533,537 ****
if (err) {
! FrmAlert(altCompute);
return false;
}
--- 533,537 ----
if (err) {
! alertErrorMessage(err);
return false;
}
***************
*** 539,543 ****
err = stack_compute(stack);
if (err) {
! FrmAlert(altCompute);
stack_delete(stack);
return false;
--- 539,543 ----
err = stack_compute(stack);
if (err) {
! alertErrorMessage(err);
stack_delete(stack);
return false;
***************
*** 550,554 ****
if (err) {
rpn_delete(result);
! FrmAlert(altCompute);
return false;
}
--- 550,554 ----
if (err) {
rpn_delete(result);
! alertErrorMessage(err);
return false;
}
***************
*** 732,736 ****
}
if (err)
! FrmAlert(altCompute);
else {
res = true;
--- 732,736 ----
}
if (err)
! alertErrorMessage(err);
else {
res = true;
***************
*** 796,800 ****
text = FldGetTextPtr(field);
if (!text)
! FrmAlert(altCompute);
else {
stack = text_to_stack(text,&err);
--- 796,800 ----
text = FldGetTextPtr(field);
if (!text)
! FrmAlert(altCompute);
else {
stack = text_to_stack(text,&err);
***************
*** 806,810 ****
}
if (err)
! FrmAlert(altCompute);
else {
res = true;
--- 806,810 ----
}
if (err)
! alertErrorMessage(err);
else {
res = true;
|
