[Easycalc-commits] easycalc grcalc.c,1.19,1.20

[Ton v. O. <tvo...@us...>]

Update of /cvsroot/easycalc/easycalc
In directory sc8-pr-cvs17:/tmp/cvs-serv13350

Modified Files:
	grcalc.c 
Log Message:
Bug fix: Also draw the tracing cross lines at the result of the intersect
function.
Draw result cross before displaying the result alert.


Index: grcalc.c
===================================================================
RCS file: /cvsroot/easycalc/easycalc/grcalc.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** grcalc.c	12 Sep 2006 19:40:55 -0000	1.19
--- grcalc.c	25 Aug 2007 17:58:14 -0000	1.20
***************
*** 296,321 ****
  		   display better values */
  		/* Save the result as 'graphres' variable */
! 		db_save_real("graphres",result);
  
  		/* Round the result with respect to computing error */
  		result /= 1E-5;
  		result = round(result) * 1E-5;
! 		text = display_real(result);
! 		
! 		/* Fetch description of a function */
! 		SysStringByIndex(strGrcDescription,grFuncType,
! 				 acdescr,MAX_RSCLEN-1);
! 		FrmCustomAlert(altComputeResult,acdescr,text,NULL);
! 		MemPtrFree(text);
  		/* Set the cross to result where applicable */
  		switch (grFuncType) {
  		case cp_zero:
  		case cp_min:
  		case cp_max:
  		case cp_value:
! 			grtaps_track_manual(result,track_set);
  			break;
  		}
  
  	} else
  		FrmAlert(altCompute);
--- 296,322 ----
  		   display better values */
  		/* Save the result as 'graphres' variable */
! 		db_save_real("graphres", result);
  
  		/* Round the result with respect to computing error */
  		result /= 1E-5;
  		result = round(result) * 1E-5;
! 
  		/* Set the cross to result where applicable */
  		switch (grFuncType) {
+ 		case cp_intersect:
  		case cp_zero:
  		case cp_min:
  		case cp_max:
  		case cp_value:
! 			grtaps_track_manual(result, track_set);
  			break;
  		}
  
+ 		text = display_real(result);
+ 		/* Fetch description of a function */
+ 		SysStringByIndex(strGrcDescription, grFuncType,
+ 		                 acdescr, MAX_RSCLEN - 1);
+ 		FrmCustomAlert(altComputeResult, acdescr, text, NULL);
+ 		MemPtrFree(text);
  	} else
  		FrmAlert(altCompute);