easycalc-commits

[Easycalc-commits] easycalc graph.c,1.60,1.61

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

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

Modified Files:
	graph.c 
Log Message:
Redraw axes labels after each curve.


Index: graph.c
===================================================================
RCS file: /cvsroot/easycalc/easycalc/graph.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** graph.c	30 Sep 2007 00:35:42 -0000	1.60
--- graph.c	30 Sep 2007 01:08:09 -0000	1.61
***************
*** 895,899 ****
  	  return;
  	if (graphState.funcnum>=MAX_GRFUNCS) {
- 		graph_draw_axes_labels(&stdbounds);
  		graph_draw_stop();
  		return;
--- 895,898 ----
***************
*** 918,922 ****
  		}
  		graphState.position += i;
! 		if (graphState.position > ScrPrefs.xmax) {   /* (ScrPrefs.xmax-ScrPrefs.xmin) */
  			graphState.position = 0;
  			graphState.funcnum++;
--- 917,924 ----
  		}
  		graphState.position += i;
! 		if (graphState.position > ScrPrefs.xmax) {
! 			/* Curve finished */
! 			/* Redraw labels. They may have been overwritten */
! 			graph_draw_axes_labels(&stdbounds);
  			graphState.position = 0;
  			graphState.funcnum++;
***************
*** 944,947 ****
--- 946,951 ----
  		if (start >= graphState.stop) {
  			/* Reached end of drawing area/parameters */
+ 			/* Redraw labels. They may have been overwritten */
+ 			graph_draw_axes_labels(&stdbounds);
  			graphState.position = 0;
  			graphState.funcnum++;

[Easycalc-commits] easycalc graph.c,1.60,1.61

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

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

Modified Files:
	graph.c 
Log Message:
fixed bugs

Index: graph.c
===================================================================
RCS file: /cvsroot/easycalc/easycalc/graph.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** graph.c	30 Sep 2007 00:35:42 -0000	1.60
--- graph.c	16 Dec 2007 12:37:17 -0000	1.61
***************
*** 488,491 ****
--- 488,495 ----
  }
  
+ #ifndef SUPPORT_DIA
+ #define HanderaCoord(x)	(x)
+ #endif
+ 
  static void graph_draw_axes_labels(RectangleType *stdbounds) GRAPH;
  static void
***************
*** 794,797 ****
--- 798,803 ----
  			if (err)
  			  continue;
+ 			/* Lookup variables to speed up execution */
+ 			stack_fix_variables(stack);
  			graphCurves[i].stack2 = stack;
  		}
***************
*** 895,899 ****
  	  return;
  	if (graphState.funcnum>=MAX_GRFUNCS) {
- 		graph_draw_axes_labels(&stdbounds);
  		graph_draw_stop();
  		return;
--- 901,904 ----
***************
*** 918,922 ****
  		}
  		graphState.position += i;
! 		if (graphState.position > ScrPrefs.xmax) {   /* (ScrPrefs.xmax-ScrPrefs.xmin) */
  			graphState.position = 0;
  			graphState.funcnum++;
--- 923,930 ----
  		}
  		graphState.position += i;
! 		if (graphState.position > ScrPrefs.xmax) {
! 			/* Curve finished */
! 			/* Redraw labels. They may have been overwritten */
! 			graph_draw_axes_labels(&stdbounds);
  			graphState.position = 0;
  			graphState.funcnum++;
***************
*** 944,947 ****
--- 952,957 ----
  		if (start >= graphState.stop) {
  			/* Reached end of drawing area/parameters */
+ 			/* Redraw labels. They may have been overwritten */
+ 			graph_draw_axes_labels(&stdbounds);
  			graphState.position = 0;
  			graphState.funcnum++;