[Easycalc-commits] easycalc graph.c,1.52,1.53

[Jorge G. <cl...@us...>]

Update of /cvsroot/easycalc/easycalc
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv31209

Modified Files:
	graph.c 
Log Message:
Changes in Graph Setup form; Added checkboxes to select the functions to graph

Index: graph.c
===================================================================
RCS file: /cvsroot/easycalc/easycalc/graph.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** graph.c	19 Oct 2006 01:46:38 -0000	1.52
--- graph.c	19 Oct 2006 19:37:32 -0000	1.53
***************
*** 93,101 ****
  	if (grayDisplay || colorDisplay) {
  		if (funcnum == -1) {
! 			WinSetBackColor(graphPrefs.colors[6]); /* background */
! 			WinSetForeColor(graphPrefs.colors[7]); /* axis */
          	}
  		else if (funcnum == -2)
! 			WinSetForeColor(graphPrefs.colors[8]); /* grid */
  		else
  			WinSetForeColor(graphPrefs.colors[funcnum]); /* graph */
--- 93,101 ----
  	if (grayDisplay || colorDisplay) {
  		if (funcnum == -1) {
! 			WinSetBackColor(graphPrefs.colors[8]); /* background */
! 			WinSetForeColor(graphPrefs.colors[6]); /* axis */
          	}
  		else if (funcnum == -2)
! 			WinSetForeColor(graphPrefs.colors[7]); /* grid */
  		else
  			WinSetForeColor(graphPrefs.colors[funcnum]); /* graph */
***************
*** 488,500 ****
  	clie_eraserectangle(&natbounds,0);
  
  	/* Now draw the y axis */
  	x = graph_xgr2scr(0.0);
  	if (x>ScrPrefs.xmin && x<ScrPrefs.xmax)
! 		clie_drawline(x,ScrPrefs.ymax,x,ScrPrefs.ymin);
  
  	/* Now draw the x axis */
  	y = graph_ygr2scr(0.0);
  	if (y>ScrPrefs.ymax && y<ScrPrefs.ymin)
! 		clie_drawline(ScrPrefs.xmin,y,ScrPrefs.xmax,y);
  
  	graph_unsetcolor();
--- 488,504 ----
  	clie_eraserectangle(&natbounds,0);
  
+ 	if (graphPrefs.grEnable[6]){
+ 
  	/* Now draw the y axis */
  	x = graph_xgr2scr(0.0);
  	if (x>ScrPrefs.xmin && x<ScrPrefs.xmax)
! 	   clie_drawline(x,ScrPrefs.ymax,x,ScrPrefs.ymin);
  
  	/* Now draw the x axis */
  	y = graph_ygr2scr(0.0);
  	if (y>ScrPrefs.ymax && y<ScrPrefs.ymin)
! 	   clie_drawline(ScrPrefs.xmin,y,ScrPrefs.xmax,y);
! 	
! 	}
  
  	graph_unsetcolor();
***************
*** 504,508 ****
  	WinGetClip(&clip);
  	FrmGetObjectBounds(frm, FrmGetObjectIndex(frm, graphId), &stdbounds);
! 	if (graphPrefs.grid &&
  	    clip.topLeft.y <= stdbounds.topLeft.y &&
  	    clip.topLeft.y + clip.extent.y >= stdbounds.topLeft.y + stdbounds.extent.y)
--- 508,512 ----
  	WinGetClip(&clip);
  	FrmGetObjectBounds(frm, FrmGetObjectIndex(frm, graphId), &stdbounds);
! 	if (graphPrefs.grEnable[7] &&
  	    clip.topLeft.y <= stdbounds.topLeft.y &&
  	    clip.topLeft.y + clip.extent.y >= stdbounds.topLeft.y + stdbounds.extent.y)
***************
*** 800,804 ****
  
  	/* Check, if we have all functions to draw graph */
! 	if (!graphCurves[graphState.funcnum].stack1 ||
  		(graphPrefs.functype==graph_param && !graphCurves[graphState.funcnum].stack2)) {
  		graphState.funcnum++;
--- 804,808 ----
  
  	/* Check, if we have all functions to draw graph */
! 	if (!graphPrefs.grEnable[graphState.funcnum] || !graphCurves[graphState.funcnum].stack1 ||
  		(graphPrefs.functype==graph_param && !graphCurves[graphState.funcnum].stack2)) {
  		graphState.funcnum++;