easycalc-commits Mailing List for EasyCalc (Page 10)

Brought to you by: mapibid, ondrap, tvoverbe

easycalc-commits — Read-only list for CVS commits

You can subscribe to this list here.

2006	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug (36)	_Sep (44)	_Oct (25)	_Nov (2)	_Dec (5)
2007	_Jan (1)	_Feb (1)	_Mar	_Apr	_May (9)	_Jun	_Jul (4)	_Aug (8)	_Sep (16)	_Oct	_Nov (2)	_Dec (28)
2008	_Jan	_Feb (2)	_Mar	_Apr	_May (11)	_Jun	_Jul	_Aug	_Sep (2)	_Oct	_Nov	_Dec
2009	_Jan	_Feb	_Mar	_Apr	_May	_Jun (33)	_Jul (5)	_Aug (7)	_Sep (9)	_Oct (31)	_Nov (25)	_Dec (21)
2011	_Jan (2)	_Feb (12)	_Mar	_Apr (7)	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

Flat | Threaded

<< < 1 .. 8 9 10 11 12 .. 14 > >> (Page 10 of 14)

[Easycalc-commits] easycalc/include stack.h,1.7,1.8

From: Jorge G. <cl...@us...> - 2007-05-29 15:33:00

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

Modified Files:
	stack.h 
Log Message:
undo last changes

Index: stack.h
===================================================================
RCS file: /cvsroot/easycalc/easycalc/include/stack.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** stack.h	23 Sep 2006 22:13:05 -0000	1.7
--- stack.h	29 May 2007 15:32:31 -0000	1.8
***************
*** 45,48 ****
--- 45,49 ----
  void stack_delete(CodeStack *stack) MLIB;
  void stack_copy(CodeStack *dest,CodeStack *orig) MLIB;
+ CError  stack_item_type_nr(CodeStack *stack,rpntype *type,Int16 itnum) MLIB;
  void stack_reverse(CodeStack *stack) MLIB;
  double reduce_precision(double value) MLIB;

[Easycalc-commits] easycalc/mlib stack.c,1.36,1.37

From: Jorge G. <cl...@us...> - 2007-05-29 15:19:18

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

Modified Files:
	stack.c 
Log Message:
undo last changes

Index: stack.c
===================================================================
RCS file: /cvsroot/easycalc/easycalc/mlib/stack.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** stack.c	23 Sep 2006 22:13:05 -0000	1.36
--- stack.c	29 May 2007 15:19:13 -0000	1.37
***************
*** 515,518 ****
--- 515,531 ----
  }
  
+ CError 
+ stack_item_type_nr(CodeStack *stack,rpntype *type,Int16 itnum)
+ {
+ 	Trpn tmp;
+ 
+ 	if (stack->size<itnum)
+ 		return c_internal;
+ 	tmp = stack->stack[stack->size - itnum -1];
+ 	
+ 	*type = tmp.type;
+ 	return c_noerror;
+ }
+ 
  /***********************************************************************
   *

[Easycalc-commits] easycalc/mlib complex.c, 1.22, 1.23 mathem.c, 1.35, 1.36

From: Jorge G. <cl...@us...> - 2007-05-27 01:34:14

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

Modified Files:
	complex.c mathem.c 
Log Message:
complex support for rounding and truncation functions (ROUND, TRUNC, CEIL, FLOOR)

Index: complex.c
===================================================================
RCS file: /cvsroot/easycalc/easycalc/mlib/complex.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** complex.c	17 Sep 2006 11:46:06 -0000	1.22
--- complex.c	27 May 2007 01:34:09 -0000	1.23
***************
*** 726,732 ****
  		result = cplx_atanh(carg);
  		break;
! 
  	default:
! 		return c_badfunc;
  	}       
  
--- 726,748 ----
  		result = cplx_atanh(carg);
  		break;
! 	case MATH_FLOOR:
! 	case MATH_CEIL:
! 		res=carg.real;
! 		stack_add_val(stack,&res,real);	
! 		if ((err=math_math(func,stack)))
! 			return err;
! 		if ((err=stack_get_val(stack,&res,real)))
! 			return err;		
! 		result.real=res;
! 		res=carg.imag;
! 		stack_add_val(stack,&res,real);	
! 		if ((err=math_math(func,stack)))
! 			return err;
! 		if ((err=stack_get_val(stack,&res,real)))
! 			return err;		
! 		result.imag=res;
! 		break;
  	default:
! 		return c_badarg;
  	}       
  
***************
*** 745,746 ****
--- 761,811 ----
  	return err;	   	
  }
+ 
+ /***********************************************************************
+  *
+  * FUNCTION:     cplx_round
+  * 
+  * DESCRIPTION:  Compute round or trunc on complex numbers
+  *
+  * PARAMETERS:   On stack 1 or 2 arguments 
+  *			(first - complex number ; second - no. of decimal points)
+  *
+  * RETURN:       On stack 1 complex result
+  *      
+  ***********************************************************************/
+ CError
+ cplx_round(Functype *func,CodeStack *stack)
+ {
+ 	Complex carg;
+ 	double arg,precision;
+ 	CError err;
+ 
+ 	if(func->paramcount == 2)
+ 		if ((err=stack_get_val(stack,&precision,real)))
+ 			return err;
+ 	if ((err=stack_get_val(stack,&carg,complex)))
+ 		return err;
+ 	
+ 	arg=carg.real;
+ 	stack_add_val(stack,&arg,real);	
+ 	if(func->paramcount == 2)
+ 		stack_add_val(stack,&precision,real);	
+ 	if ((err=math_round(func,stack)))
+ 		return err;
+ 	if ((err=stack_get_val(stack,&arg,real)))
+ 		return err;		
+ 	carg.real=arg;
+ 
+ 	arg=carg.imag;
+ 	stack_add_val(stack,&arg,real);	
+ 	if(func->paramcount == 2)
+ 		stack_add_val(stack,&precision,real);	
+ 	if ((err=math_round(func,stack)))
+ 		return err;
+ 	if ((err=stack_get_val(stack,&arg,real)))
+ 		return err;		
+ 	carg.imag=arg;
+ 
+ 	err=stack_add_val(stack,&carg,complex);
+ 	return err;	   	
+ }
\ No newline at end of file

Index: mathem.c
===================================================================
RCS file: /cvsroot/easycalc/easycalc/mlib/mathem.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** mathem.c	10 Oct 2006 00:58:36 -0000	1.35
--- mathem.c	27 May 2007 01:34:09 -0000	1.36
***************
*** 754,760 ****
  	
  	/* complex is defined for these operations */
! 	if ((func->num==MATH_ABS || func->num==MATH_EXP ||
  		func->num==MATH_SQRT || func->num==MATH_LN || func->num==MATH_LOG || 
! 		func->num==MATH_LOG2) &&
  		type==complex)
  	  return  cplx_math(func,stack);
--- 754,761 ----
  	
  	/* complex is defined for these operations */
! 	if (/*(func->num==MATH_ABS || func->num==MATH_EXP ||
  		func->num==MATH_SQRT || func->num==MATH_LN || func->num==MATH_LOG || 
! 		func->num==MATH_LOG2|| func->num==MATH_FLOOR || 
! 		func->num==MATH_CEIL) &&*/
  		type==complex)
  	  return  cplx_math(func,stack);
***************
*** 876,879 ****
--- 877,881 ----
  	double arg;
  	CError err;
+ 	rpntype type;
  
  	if (func->paramcount == 2) {
***************
*** 886,889 ****
--- 888,901 ----
  		return c_badargcount;
  
+ 	err = stack_item_type(stack,&type,0);
+ 	if (err)
+ 		return err;
+ 	
+ 	if (type==complex){
+ 		if(func->paramcount == 2)
+ 			stack_add_val(stack,&precision,real);
+ 		return  cplx_round(func,stack);
+ 	}
+ 	
  	if ((err=stack_get_val(stack,&arg,real))) 
  		return err;

[Easycalc-commits] easycalc/include complex.h,1.9,1.10

From: Jorge G. <cl...@us...> - 2007-05-27 01:34:14

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

Modified Files:
	complex.h 
Log Message:
complex support for rounding and truncation functions (ROUND, TRUNC, CEIL, FLOOR)

Index: complex.h
===================================================================
RCS file: /cvsroot/easycalc/easycalc/include/complex.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** complex.h	12 Sep 2006 19:40:55 -0000	1.9
--- complex.h	27 May 2007 01:34:09 -0000	1.10
***************
*** 31,34 ****
--- 31,35 ----
  CError cplx_oper(Functype *func,CodeStack *stack) MLIB;
  CError cplx_math(Functype *func,CodeStack *stack) MLIB;
+ CError cplx_round(Functype *func,CodeStack *stack) MLIB;
  Complex cplx_add(Complex arg1,Complex arg2) MLIB;
  Complex cplx_multiply(Complex arg1,Complex arg2) MLIB;

[Easycalc-commits] easycalc graph.c,1.57,1.58 grsetup.c,1.32,1.33

From: Jorge G. <cl...@us...> - 2007-05-26 14:52:15

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

Modified Files:
	graph.c grsetup.c 
Log Message:
- points graphing replaced for crosses for a better visibility
- functions can be arranged on the GraphSetup form by dragging

Index: grsetup.c
===================================================================
RCS file: /cvsroot/easycalc/easycalc/grsetup.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** grsetup.c	10 Nov 2006 04:12:56 -0000	1.32
--- grsetup.c	26 May 2007 14:52:10 -0000	1.33
***************
*** 36,39 ****
--- 36,40 ----
  #include "calcrsc.h"
  #include "calc.h"
+ #include "stack.h"
  
  #ifdef SUPPORT_DIA
***************
*** 54,57 ****
--- 55,60 ----
  };
  
+ static void draw_grType(FormType *frm) IFACE;
+ 
  static const char *
  grsetup_param_name(void) IFACE;
***************
*** 356,380 ****
   *      
   ***********************************************************************/
! Boolean
! grsetup_handle_pendown(RectangleType *bounds)
  {
  	Boolean penDown;
! 	Boolean inrect = true;
  	Coord x,y;
! 	
! 	WinInvertRectangle(bounds,0);
  	do {
  		EvtGetPen(&x,&y,&penDown);
! 		if (RctPtInRectangle(x,y,bounds) && !inrect) {
! 			inrect = true;
! 			WinInvertRectangle(bounds,0);
! 		} else if (!RctPtInRectangle(x,y,bounds) && inrect) {
! 			inrect = false;
! 			WinInvertRectangle(bounds,0);
! 		}		
  	}while(penDown);
! 	if (inrect)
! 	  WinInvertRectangle(bounds,0);
! 	return inrect;
  }
  
--- 359,442 ----
   *      
   ***********************************************************************/
! Int16
! grsetup_handle_pendown(Int16 row,Int16 col)
  {
  	Boolean penDown;
! 	Boolean inrect;
! 	Int16 redraw=0;
  	Coord x,y;
! 	Int16 row2,row1=row;
! 	RectangleType bounds,oldbounds;
! 	TablePtr tbl = GetObjectPtr(grSetupTable);
! 
! 	TblGetItemBounds(tbl,row,col,&oldbounds);
! #ifdef SUPPORT_DIA
! 	/* Height for customTableItem is fixed at 11, so we  have to adjust it for Handera */
! 	oldbounds.extent.y = HanderaCoord(oldbounds.extent.y);
! #endif
! 	WinInvertRectangle(&oldbounds,0);
! 
  	do {
  		EvtGetPen(&x,&y,&penDown);
! 		inrect=false;
! 		if(redraw) redraw++;
! 		
! 		for(row2=TblGetNumberOfRows(tbl)-1;(row2>=0 && !inrect);row2--){
! 			TblGetItemBounds(GetObjectPtr(grSetupTable),row2,col,&bounds);
! #ifdef SUPPORT_DIA
! 			bounds.extent.y = HanderaCoord(bounds.extent.y);
! #endif
! 			if(RctPtInRectangle(x,y,&bounds))
! 				inrect=true;
! 		}
! 		
! 		if(inrect){
! 		  row2++;
! 		  if(row2!=row1){
! 			if(row1!=row)WinInvertRectangle(&oldbounds,0);
! 			if(row2!=row)WinInvertRectangle(&bounds,0);
! 			row1=row2;
! 			oldbounds=bounds;
! 		  }		  
! 		}else{ 
! 			if(graphPrefs.functype==graph_param){
! 					if(firstVisible && y<bounds.topLeft.y){
! 						firstVisible=0;
! 						redraw=1;
! 					}else if(!firstVisible){
! 						TblGetBounds(tbl,&bounds);
! #ifdef SUPPORT_DIA
! 						bounds.extent.y = HanderaCoord(bounds.extent.y);
! #endif
! 						if(y>bounds.topLeft.y+bounds.extent.y){
! 							firstVisible=TblGetNumberOfRows(tbl);
! 							redraw=1;
! 						}
! 					}
! 					if(redraw==1){
! 						row1=row=-1;
! 						FrmDrawForm(FrmGetActiveForm());
! 						draw_grType(FrmGetActiveForm());
! 					}
! 			}
! 			if(row1!=row){
! 				WinInvertRectangle(&oldbounds,0);
! 				row1=row;
! 			}
! 		}
  	}while(penDown);
! 
! 	if (inrect && row2!=row)
! 		WinInvertRectangle(&bounds,0);
! 
! 	if(!redraw){
! 		TblGetItemBounds(tbl,row,col,&oldbounds);
! #ifdef SUPPORT_DIA
! 		bounds.extent.y = HanderaCoord(bounds.extent.y);
! #endif*/
! 		WinInvertRectangle(&oldbounds,0);
! 	}
! 	
! 	return row2;
  }
  
***************
*** 557,561 ****
  #endif
  
- static void draw_grType(FormType *frm) IFACE;
  static void
  draw_grType(FormType *frm)
--- 619,622 ----
***************
*** 592,598 ****
  			switch (graphPrefs.grType[k]) {
  			case 0:
! 				WinDrawLine(x1, y2, x1, y2);
! 				WinDrawLine(x2 ,y2, x2, y2);
! 				WinDrawLine(x3, y2, x3, y2);
  				break;
  			case 2:
--- 653,661 ----
  			switch (graphPrefs.grType[k]) {
  			case 0:
! 				x1++; x3--;
! 				WinDrawLine(x1-1, y2, x1+1, y2);
! 				WinDrawLine(x1 ,y2-1, x1, y2+1);
! 				WinDrawLine(x3-1, y2, x3+1, y2);
! 				WinDrawLine(x3,y2-1, x3, y2+1);
  				break;
  			case 2:
***************
*** 645,650 ****
  	FormPtr    frm=FrmGetActiveForm();
  	Int16 controlId;
! 	RectangleType bounds;
! 	Int16 row=0, col;
  
  #ifdef SUPPORT_DIA
--- 708,712 ----
  	FormPtr    frm=FrmGetActiveForm();
  	Int16 controlId;
! 	Int16 row=0;
  
  #ifdef SUPPORT_DIA
***************
*** 656,670 ****
  	switch (event->eType) {
  	 case tblEnterEvent:
  		row = event->data.tblSelect.row;
  		col = event->data.tblSelect.column;
! 		TblGetItemBounds(GetObjectPtr(grSetupTable),
! 						 row,col,&bounds);
! #ifdef SUPPORT_DIA
! 		/* Height for customTableItem is fixed at 11, so we
! 		   have to adjust it for Handera */
! 		bounds.extent.y = HanderaCoord(bounds.extent.y);
! #endif
! 		if (grsetup_handle_pendown(&bounds)) {
! 			selectedRow = row + firstVisible;
  			switch (col) {
  			 case COL_FLIST:
--- 718,736 ----
  	switch (event->eType) {
  	 case tblEnterEvent:
+ 	  {
+ 		Int16 col,row2;
+ 		TablePtr tbl = GetObjectPtr(grSetupTable);
  		row = event->data.tblSelect.row;
  		col = event->data.tblSelect.column;
! 
! 		row+=firstVisible;
! 		row2=grsetup_handle_pendown(row-firstVisible,col);
! 		if(row-firstVisible<TblGetNumberOfRows(tbl))
! 			TblMarkRowInvalid(tbl,row-firstVisible);
! 		TblMarkRowInvalid(tbl,row2);
! 		row2+=firstVisible;
! 
! 		if (row2==row) {
! 			selectedRow = row;
  			switch (col) {
  			 case COL_FLIST:
***************
*** 675,681 ****
  				break;
  			}
! 		}
  		handled = true;
  		break;
  	 case keyDownEvent:
  		switch (event->data.keyDown.chr) {
--- 741,790 ----
  				break;
  			}
! 		}else if(row2>=firstVisible){
! 			CError err;
! 			CodeStack *stack;
! 			char param[MAX_FUNCNAME+1];
! 			char *value=grsetup_get_fname(row);
! 			char *value2=grsetup_get_fname(row2);
! 			
! 			StrCopy(param,value2);
! 			if(StrCompare(value,grsetup_def_name(row)))
! 				StrCopy(value2,value);
! 			else StrCopy(value2,grsetup_def_name(row2));
! 			if(StrCompare(param,grsetup_def_name(row2)))
! 				StrCopy(value,param);
! 			else StrCopy(value,grsetup_def_name(row));
! 			
! 			err =db_func_description(grsetup_def_name(row),&value,param);
! 			if(!err){
! 				stack = text_to_stack(value,&err);
! 				if(!err){
! 					StrCopy(parameter_name,param);
! 					err =db_func_description(grsetup_def_name(row2),&value2,param);
! 					db_write_function(grsetup_def_name(row2),stack,value);
! 					stack_delete(stack);
! 				}
! 				MemPtrFree(value);
! 			}else{
! 				err =db_func_description(grsetup_def_name(row2),&value2,param);
! 				db_delete_record(grsetup_def_name(row2));
! 			}
! 			
! 			if(!err){
! 				stack = text_to_stack(value2,&err);
! 				if(!err){
! 					StrCopy(parameter_name,param);
! 					db_write_function(grsetup_def_name(row),stack,value2);
! 					stack_delete(stack);
! 				}
! 				MemPtrFree(value2);
! 			}else
! 				db_delete_record(grsetup_def_name(row));
! 				
! 			TblRedrawTable(tbl);
! 		}	
  		handled = true;
  		break;
+ 	  }
  	 case keyDownEvent:
  		switch (event->data.keyDown.chr) {

Index: graph.c
===================================================================
RCS file: /cvsroot/easycalc/easycalc/graph.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** graph.c	24 May 2007 20:28:55 -0000	1.57
--- graph.c	26 May 2007 14:52:10 -0000	1.58
***************
*** 347,352 ****
  
  	  case 0:
! 		if(ison)
! 		  clie_drawpixel(graph_xgr2scr(x),graph_ygr2scr(y));
  		break;
  
--- 347,356 ----
  
  	  case 0:
! 		if(ison){
! 		  Coord xx=graph_xgr2scr(x);
! 		  Coord yy=graph_ygr2scr(y);
! 		  clie_drawline(xx,yy-1,xx,yy+1);
! 		  clie_drawline(xx-1,yy,xx+1,yy);
! 		}
  		break;
  
***************
*** 361,372 ****
  
  		   if(y>graphPrefs.ymax){
! 			if(y0<=ScrPrefs.ymax) break;
! 			if(y0>=ScrPrefs.ymin) y0=ScrPrefs.ymin;
  			else y0--;
  			yy=ScrPrefs.ymax;
  		   }
  		   else if(y<graphPrefs.ymin){
! 			if(y0>=ScrPrefs.ymin) break;
! 			if(y0<=ScrPrefs.ymax) y0=ScrPrefs.ymax;
  			else y0++;
  			yy=ScrPrefs.ymin;
--- 365,376 ----
  
  		   if(y>graphPrefs.ymax){
! 			if(graphPrefs.ymax<0) break;
! 			if(graphPrefs.ymin>0) y0=ScrPrefs.ymin;
  			else y0--;
  			yy=ScrPrefs.ymax;
  		   }
  		   else if(y<graphPrefs.ymin){
! 			if(graphPrefs.ymin>0) break;
! 			if(graphPrefs.ymax<0) y0=ScrPrefs.ymax;
  			else y0++;
  			yy=ScrPrefs.ymin;
***************
*** 374,379 ****
  		   else{
  			yy=graph_ygr2scr(y);
! 			if(y0<=ScrPrefs.ymax) y0=ScrPrefs.ymax;
! 			else if(y0>=ScrPrefs.ymin) y0=ScrPrefs.ymin;
  			else y0-=sgn(y);
  		   }
--- 378,383 ----
  		   else{
  			yy=graph_ygr2scr(y);
! 			if(graphPrefs.ymax<0) y0=ScrPrefs.ymax;
! 			else if(graphPrefs.ymin>0) y0=ScrPrefs.ymin;
  			else y0-=sgn(y);
  		   }

[Easycalc-commits] easycalc graph.c,1.56,1.57

From: Jorge G. <cl...@us...> - 2007-05-24 20:29:01

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

Modified Files:
	graph.c 
Log Message:
Fixed bug

Index: graph.c
===================================================================
RCS file: /cvsroot/easycalc/easycalc/graph.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** graph.c	11 May 2007 10:50:58 -0000	1.56
--- graph.c	24 May 2007 20:28:55 -0000	1.57
***************
*** 354,365 ****
  		if(!isnan(y))
  		{
! 		   Coord xx=graph_xgr2scr(x);
  		   Coord y0=graph_ygr2scr(0.0);
- 		   Coord yy=graph_ygr2scr(y);
  
! 		   if(xx>ScrPrefs.xmax || xx<ScrPrefs.xmin)
  			break;	/* polar, parametric or DRAW_AT_ONCE !=1 */
  
! 		   if(yy<ScrPrefs.ymax || isinf(y)>0){
  			if(y0<=ScrPrefs.ymax) break;
  			if(y0>=ScrPrefs.ymin) y0=ScrPrefs.ymin;
--- 354,364 ----
  		if(!isnan(y))
  		{
! 		   Coord yy,xx;
  		   Coord y0=graph_ygr2scr(0.0);
  
! 		   if(x>graphPrefs.xmax || x<graphPrefs.xmin)
  			break;	/* polar, parametric or DRAW_AT_ONCE !=1 */
  
! 		   if(y>graphPrefs.ymax){
  			if(y0<=ScrPrefs.ymax) break;
  			if(y0>=ScrPrefs.ymin) y0=ScrPrefs.ymin;
***************
*** 367,371 ****
  			yy=ScrPrefs.ymax;
  		   }
! 		   else if(yy>ScrPrefs.ymin || isinf(y)<0){
  			if(y0>=ScrPrefs.ymin) break;
  			if(y0<=ScrPrefs.ymax) y0=ScrPrefs.ymax;
--- 366,370 ----
  			yy=ScrPrefs.ymax;
  		   }
! 		   else if(y<graphPrefs.ymin){
  			if(y0>=ScrPrefs.ymin) break;
  			if(y0<=ScrPrefs.ymax) y0=ScrPrefs.ymax;
***************
*** 374,377 ****
--- 373,377 ----
  		   }
  		   else{
+ 			yy=graph_ygr2scr(y);
  			if(y0<=ScrPrefs.ymax) y0=ScrPrefs.ymax;
  			else if(y0>=ScrPrefs.ymin) y0=ScrPrefs.ymin;
***************
*** 379,382 ****
--- 379,383 ----
  		   }
  
+ 		   xx=graph_xgr2scr(x);
  		   clie_drawline(xx,y0,xx,yy);
  		}

[Easycalc-commits] easycalc graph.c,1.55,1.56

From: Jorge G. <cl...@us...> - 2007-05-11 10:51:08

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

Modified Files:
	graph.c 
Log Message:
bug fixed

Index: graph.c
===================================================================
RCS file: /cvsroot/easycalc/easycalc/graph.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** graph.c	28 Dec 2006 03:16:16 -0000	1.55
--- graph.c	11 May 2007 10:50:58 -0000	1.56
***************
*** 295,300 ****
  		return;
  	} 
! 	*newx = onx;
! 	*newy = ony;
  }
  
--- 295,326 ----
  		return;
  	} 
! 
! 	tmp = (graphPrefs.xmax - graphPrefs.xmin)/(ScrPrefs.xmax-ScrPrefs.xmin);
!       if(offx>onx)
! 		*newx=onx+tmp;
! 	else
! 		*newx=onx-tmp;
! 
! 	tmp = (graphPrefs.ymax - graphPrefs.ymin)/(ScrPrefs.ymin-ScrPrefs.ymax);
!       if(offy>ony)
! 		*newy=ony+tmp;
! 	else
! 		*newy=ony-tmp;
! 
! 	if(isinf(offy)>0 && finite(offx))
! 		*newy=graphPrefs.ymax;
! 	else
! 	if(isinf(offy)<0 && finite(offx))
! 		*newy=graphPrefs.ymin;
! 	else
! 	if(isinf(offx)>0 && finite(offy))
! 		*newx=graphPrefs.xmax;
! 	else
! 	if(isinf(offx)<0 && finite(offy))
! 		*newx=graphPrefs.xmin;
! 	else{
! 		*newx = onx;
! 		*newy = ony;
! 	}
  }
  
***************
*** 326,330 ****
  
  	  case 2:
! 		if(finite(y))
  		{
  		   Coord xx=graph_xgr2scr(x);
--- 352,356 ----
  
  	  case 2:
! 		if(!isnan(y))
  		{
  		   Coord xx=graph_xgr2scr(x);
***************
*** 335,339 ****
  			break;	/* polar, parametric or DRAW_AT_ONCE !=1 */
  
! 		   if(yy<ScrPrefs.ymax){
  			if(y0<=ScrPrefs.ymax) break;
  			if(y0>=ScrPrefs.ymin) y0=ScrPrefs.ymin;
--- 361,365 ----
  			break;	/* polar, parametric or DRAW_AT_ONCE !=1 */
  
! 		   if(yy<ScrPrefs.ymax || isinf(y)>0){
  			if(y0<=ScrPrefs.ymax) break;
  			if(y0>=ScrPrefs.ymin) y0=ScrPrefs.ymin;
***************
*** 341,345 ****
  			yy=ScrPrefs.ymax;
  		   }
! 		   else if(yy>ScrPrefs.ymin){
  			if(y0>=ScrPrefs.ymin) break;
  			if(y0<=ScrPrefs.ymax) y0=ScrPrefs.ymax;
--- 367,371 ----
  			yy=ScrPrefs.ymax;
  		   }
! 		   else if(yy>ScrPrefs.ymin || isinf(y)<0){
  			if(y0>=ScrPrefs.ymin) break;
  			if(y0<=ScrPrefs.ymax) y0=ScrPrefs.ymax;

[Easycalc-commits] easycalc main.c,1.70,1.71

From: Jorge G. <cl...@us...> - 2007-02-12 10:00:41

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

Modified Files:
	main.c 
Log Message:
Highlight of brackets when closing

Index: main.c
===================================================================
RCS file: /cvsroot/easycalc/easycalc/main.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** main.c	10 Oct 2006 00:58:36 -0000	1.70
--- main.c	12 Feb 2007 10:00:29 -0000	1.71
***************
*** 780,783 ****
--- 780,784 ----
  	Tbase trig;
  	Tbase base;
+ 	static UInt16 BrH=0,start;
  
  #ifdef SUPPORT_DIA
***************
*** 787,790 ****
--- 788,799 ----
  #endif
  	
+ 	if(event->eType && BrH==1){
+ 		EventType newevent;
+ 		newevent.eType=nilEvent;
+ 		EvtAddEventToQueue(&newevent);
+ 		EvtAddEventToQueue(event);
+ 		return true;
+ 	}
+ 
  	switch (event->eType) 
  	{
***************
*** 805,808 ****
--- 814,820 ----
  			main_input_exec();
  			handled=true;
+ 		} else if (event->data.keyDown.chr==')' || event->data.keyDown.chr=='(') {
+ 			calc_nil_timeout(0);
+ 			BrH=2;
  		} else if (formid == frmScientific
  			   && event->data.keyDown.chr == pageDownChr) {
***************
*** 1041,1046 ****
--- 1053,1067 ----
  			break;
  		default:
+ 			if(calcPrefs.matchParenth) {
+ 			  handled=false;
+ 			  break;
+ 			}
+ 		case btnMainClBr:
+ 			BrH=2;
+ 			calc_nil_timeout(0);
  			handled=false;
+ 			break;
  		}
+ 
  		if (main_btnrow_click(controlID)) 
  			handled = true;
***************
*** 1123,1126 ****
--- 1144,1198 ----
  		}
  		break;		    
+ 	case fldEnterEvent:
+ 		if(event->data.fldEnter.fieldID==tdInput){
+ 		   BrH=2;
+ 		   calc_nil_timeout(0);
+ 		}
+ 		break;	
+ 	case nilEvent:
+ 		if(BrH==2){
+ 			UInt16 j,k=1,end;
+ 			char char1,char2;
+ 
+ 			field=GetObjectPtr(tdInput);
+ 			FldGetSelection(field,&start,&end);
+ 
+ 		   	if(start!=end || end==0){
+ 			   goto exit;
+ 			}
+ 
+ 			j=start-1;
+ 		   	text = FldGetTextPtr(field);
+ 			if(text[j]==')'){
+ 			   char1=')'; char2='(';
+ 			   i=-1; end=0;
+ 			}else if(text[j]=='('){
+ 			   char1='('; char2=')';
+ 			   i=1; end=StrLen(text);
+ 			}else{
+ 			   goto exit;
+ 			}
+ 
+ 			while(j!=end && k){
+ 			  j+=i;
+ 	           	  if(text[j]==char1) k++; 
+ 	           	  else if(text[j]==char2) k--; 
+ 			}
+ 
+ 			if(k) goto exit;
+ 			else{
+ 			  FldSetSelection(field,j,j+1);
+ 			  calc_nil_timeout(40);
+ 			  BrH=1;
+ 			}
+ 		}
+ 		else if(BrH==1)
+ 		{
+ 			FldSetSelection(GetObjectPtr(tdInput),start,start);
+ 		exit:	calc_nil_timeout(evtWaitForever);
+ 			BrH=0;
+ 		}
+ 		handled=true;
+ 		break;
  	}

[Easycalc-commits] easycalc/docs CREDITS,1.15,1.16

From: Ton v. O. <tvo...@us...> - 2007-01-28 01:47:08

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

Modified Files:
	CREDITS 
Log Message:
update credit for Russian translation.


Index: CREDITS
===================================================================
RCS file: /cvsroot/easycalc/easycalc/docs/CREDITS,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** CREDITS	25 Aug 2006 00:29:01 -0000	1.15
--- CREDITS	28 Jan 2007 01:47:00 -0000	1.16
***************
*** 38,42 ****
  Japanese translation
  
! dti <dti17 at narod.ru>
  Russian translation
  
--- 38,42 ----
  Japanese translation
  
! Pavel Kharitonov <dti17 at narod.ru>
  Russian translation

[Easycalc-commits] easycalc calc.c,1.38,1.39

From: Ton v. O. <tvo...@us...> - 2006-12-29 02:37:13

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

Modified Files:
	calc.c 
Log Message:
Properly close Sony HR library when used.


Index: calc.c
===================================================================
RCS file: /cvsroot/easycalc/easycalc/calc.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** calc.c	28 Dec 2006 23:24:24 -0000	1.38
--- calc.c	29 Dec 2006 02:17:37 -0000	1.39
***************
*** 328,331 ****
--- 328,339 ----
  	TerminateResizeSupport();
  #endif
+ #ifdef SONY_SDK
+ 	if (gHrMode == hrSony) {
+ 		/* Set screen back to defaults and close HR library */
+ 		HRWinScreenMode(gHrLibRefNum, winScreenModeSetToDefaults,
+ 		                NULL, NULL, NULL, NULL);
+ 		HRClose(gHrLibRefNum);
+ 	}
+ #endif
  }

[Easycalc-commits] easycalc calc.c,1.37,1.38

From: Ton v. O. <tvo...@us...> - 2006-12-28 23:24:29

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

Modified Files:
	calc.c 
Log Message:
Put grayscale Sony HiRes devices into HiRes mode. Before they reverted to LoRes
causing all kinds of problems.


Index: calc.c
===================================================================
RCS file: /cvsroot/easycalc/easycalc/calc.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** calc.c	10 Nov 2006 04:12:56 -0000	1.37
--- calc.c	28 Dec 2006 23:24:24 -0000	1.38
***************
*** 253,257 ****
  		height = hrHeight;
  		depth = 8;
! 		HRWinScreenMode ( gHrLibRefNum, winScreenModeSet, &width, &height, &depth, NULL );
  		gHrMode = hrSony;
  		gSonyFactor = 2;
--- 253,259 ----
  		height = hrHeight;
  		depth = 8;
! 		/* Following call fails for grayscale HiRes devices.
! 		 * Taken care of below in the 'if (palmOS35)' part */
! 		HRWinScreenMode(gHrLibRefNum, winScreenModeSet, &width, &height, &depth, NULL);
  		gHrMode = hrSony;
  		gSonyFactor = 2;
***************
*** 262,265 ****
--- 264,277 ----
  		if (!colorDisplay){
  			UInt32 depth=4;
+ #ifdef SONY_SDK
+ 			if (gHrMode == hrSony){
+ 				/* Set Sony Hires grayscale devices to HiRes */
+ 				UInt32 width = hrWidth;
+ 				UInt32 height = hrHeight;
+ 				if (!HRWinScreenMode(gHrLibRefNum, winScreenModeSet, &width, &height, &depth, NULL))
+ 				grayDisplay = true;
+ 			}
+ 			else
+ #endif
  			if (!WinScreenMode(winScreenModeSet,NULL,NULL,&depth,NULL))
  				grayDisplay=true;

[Easycalc-commits] easycalc/langs ru_koi8.rcp, 1.15, 1.16 ru_win.rcp, 1.14, 1.15

From: Ton v. O. <tvo...@us...> - 2006-12-28 03:18:56

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

Modified Files:
	ru_koi8.rcp ru_win.rcp 
Log Message:
Update to russian translation from dt...@na....


Index: ru_koi8.rcp
===================================================================
RCS file: /cvsroot/easycalc/easycalc/langs/ru_koi8.rcp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ru_koi8.rcp	22 Sep 2006 20:05:14 -0000	1.15
--- ru_koi8.rcp	28 Dec 2006 03:18:49 -0000	1.16
***************
*** 32,36 ****
  "$$SHOW UNITS"		=	"ðÏËÁÚÙ×ÁÔØ ÅÄÉÎÉÃÙ  "
  "$$INSERT HELP"		=	"÷ÓÔÁ×.ÓÐÒÁ×ËÕ"
! "$$PALM NUM PREFS"	=	"ÞÉÓÌ.ÎÁÓÔÒ.PDA"
  "$$DISP SCIEN"		=	"äÏÐÏÌÎÉÔÅÌØÎÙÅ ÆÕÎËÃÉÉ    "
  
--- 32,36 ----
  "$$SHOW UNITS"		=	"ðÏËÁÚÙ×ÁÔØ ÅÄÉÎÉÃÙ  "
  "$$INSERT HELP"		=	"÷ÓÔÁ×.ÓÐÒÁ×ËÕ"
! "$$PALM NUM PREFS"	=	"ÞÉÓÌ.ÎÁÓÔÒ.ëðë"
  "$$DISP SCIEN"		=	"äÏÐÏÌÎÉÔÅÌØÎÙÅ ÆÕÎËÃÉÉ    "
  
***************
*** 107,111 ****
  "$$PREFERENCES..."	=	"îÁÓÔÒÏÊËÉ..."
  "$$DEFINITION..."	=	"ïÐÒÅÄÅÌÅÎÉÑ..."
! "$$FINANCIAL..."	=	"æÉÎÁÎÓÏ×ÙÅ ÒÁÓÞÅÔÙ..."
  /**************************************************/
  "$$SOLVER..."           =       "òÅÛÅÎÉÅ..."
--- 107,111 ----
  "$$PREFERENCES..."	=	"îÁÓÔÒÏÊËÉ..."
  "$$DEFINITION..."	=	"ïÐÒÅÄÅÌÅÎÉÑ..."
! "$$FINANCIAL..."	=	"æÉÎÁÎÓÏ×ÙÅ ÒÁÓÞ£ÔÙ..."
  /**************************************************/
  "$$SOLVER..."           =       "òÅÛÅÎÉÅ..."
***************
*** 187,191 ****
  "$$GRAPH COMPUTING RESULT" = 	"òÅÚÕÌØÔÁÔ ÇÒÁÆÉÞÅÓËÉÈ ×ÙÞÉÓÌÅÎÉÊ"
  "$$COMPUTING"		=	"÷ÙÞÉÓÌÅÎÉÅ"
! "$$COMPCONFIRM"		=	"òÁÓÞÅÔ ÚÁÊÍÅÔ ÎÅËÏÔÏÒÏÅ ×ÒÅÍÑ. îÁÖÍÉÔÅ ôáë ÄÌÑ ÎÁÞÁÌÁ ×ÙÞÉÓÌÅÎÉÊ"
  "$$COMPRESULT"		=	"^1 ÆÕÎËÃÉÉ: ^2"
  "$$LEFTBOUND"		=	"÷ÙÂÅÒÉÔÅ ÌÅ×ÕÀ ÇÒÁÎÉÃÕ ÉÎÔÅÒ×ÁÌÁ É ÎÁÖÍÉÔÅ 'C'."
--- 187,191 ----
  "$$GRAPH COMPUTING RESULT" = 	"òÅÚÕÌØÔÁÔ ÇÒÁÆÉÞÅÓËÉÈ ×ÙÞÉÓÌÅÎÉÊ"
  "$$COMPUTING"		=	"÷ÙÞÉÓÌÅÎÉÅ"
! "$$COMPCONFIRM"		=	"òÁÓÞ£Ô ÚÁÊÍ£Ô ÎÅËÏÔÏÒÏÅ ×ÒÅÍÑ. îÁÖÍÉÔÅ ôáë ÄÌÑ ÎÁÞÁÌÁ ×ÙÞÉÓÌÅÎÉÊ"
  "$$COMPRESULT"		=	"^1 ÆÕÎËÃÉÉ: ^2"
  "$$LEFTBOUND"		=	"÷ÙÂÅÒÉÔÅ ÌÅ×ÕÀ ÇÒÁÎÉÃÕ ÉÎÔÅÒ×ÁÌÁ É ÎÁÖÍÉÔÅ 'C'."
***************
*** 231,235 ****
  "$$TABLE MODE"		=	"ôÁÂÌÉÞÎÙÊ ÒÅÖÉÍ"
  "$$GOTO"		=	"éÄÔÉ ÎÁ"
! "$$STEP"		=	"Step"
  "$$GO"			=	"éÄÔÉ"
  "$$SETUP GRAPHS..."	=	"÷ÙÂÏÒ ÇÒÁÆÉËÁ..."
--- 231,235 ----
  "$$TABLE MODE"		=	"ôÁÂÌÉÞÎÙÊ ÒÅÖÉÍ"
  "$$GOTO"		=	"éÄÔÉ ÎÁ"
! "$$STEP"		=	"ûÁÇ"
  "$$GO"			=	"éÄÔÉ"
  "$$SETUP GRAPHS..."	=	"÷ÙÂÏÒ ÇÒÁÆÉËÁ..."
***************
*** 278,281 ****
--- 278,283 ----
  	"ÌÅÇËÏ ÏÔÏÂÒÁÖÁÀÔÓÑ × Ä×ÏÉÞÎÏÊ ÆÏÒÍÅ. "\
  	"\n\n"\
+ 	"ïÂÙÞÎÙÊ, ÎÁÕÞÎÙÊ, ÉÎÖÅÎÅÒÎÙÊ: ÆÏÒÍÁÔÙ ÏÔÏÂÒÁÖÅÎÉÑ ÒÅÚÕÌØÔÁÔÁ "\
+ 	"(ÎÁÐÒÉÍÅÒ, × ÎÁÕÞÎÏÍ - '1.23E4', × ÏÂÙÞÎÏÍ - '1,230', × ÉÎÖÅÎÅÒÎÏÍ - '1.23K')\n\n"\
  	"ðÏËÁÚÙ×ÁÔØ ÅÄÉÎÉÃÙ - × ÉÎÖÅÎÅÒÎÏÍ ÒÅÖÉÍÅ ×Ù×ÏÄ, ÎÁÐÒÉÍÅÒ, "\
  	"10E3, ËÁË 10K É Ô.Ä. ëÏÎÅÞÎÏ, ×Ù ÍÏÖÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÜÔÉ ÅÄÉÎÉÃÙ ÐÒÉ "\
***************
*** 285,294 ****
  	"ÐÒÑÍÏ × ÓÔÒÏËÕ ××ÏÄÁ."\
  	"\n\n"\
! 	"ÞÉÓÌ. ÎÁÓÔÒ. PDA - ÐÒÉ ×ÙÂÏÒÅ EasyCalc ÂÅÒ£Ô "\
  	"ÆÏÒÍÁÔ ÞÉÓÅÌ, ×ËÌÀÞÁÑ ÔÏÞËÉ/ÚÁÐÑÔÙÅ/ÐÒÏÂÅÌÙ ÍÅÖÄÕ ÔÙÓÑÞÁÍÉ ÉÚ ÎÁÓÔÒÏÅË PalmOS. ïÂÙÞÎÏ É ÔÏÞËÁ, É ÚÁÐÑÔÁÑ "\
  	"ÒÁÓÐÏÚÎÁÀÔÓÑ ËÁË ÄÅÓÑÔÉÞÎÁÑ ÔÏÞËÁ, ÎÏ ÅÓÌÉ ×ÙÂÒÁÎ ÜÔÏÔ ÐÕÎËÔ, "\
  	"ÒÁÓÐÏÚÎÁ×ÁÔØÓÑ ÂÕÄÅÔ ÔÏÌØËÏ ÏÄÉÎ ÉÚ ÚÎÁËÏ×, - ÔÏÔ, ËÏÔÏÒÙÊ ÏÐÒÅÄÅÌÅÎ × ÎÁÓÔÒÏÊËÁÈ PalmOS. "\
  	"üÔÏ ÍÏÖÅÔ ÂÙÔØ ÐÏÌÅÚÎÏ ÐÒÉ ×ÓÔÁ×ËÅ × EasyCalc ÉÚ ÄÒÕÇÉÈ ÐÒÉÌÏÖÅÎÉÊ.\n\n"\
! 	"îÁÕÞÎÙÅ ÆÕÎËÃÉÉ - × ÏÂÙÞÎÙÊ ×ÉÄ ÄÏÂÁ×ÌÑÀÔÓÑ ËÎÏÐËÉ ×ÙÚÏ×Á "\
  	"ÎÅËÏÔÏÒÙÈ ÆÕÎËÃÉÊ (sin, ln É Ô.Ä.)."
  
--- 287,296 ----
  	"ÐÒÑÍÏ × ÓÔÒÏËÕ ××ÏÄÁ."\
  	"\n\n"\
! 	"ÞÉÓÌ. ÎÁÓÔÒ. ëðë - ÐÒÉ ×ÙÂÏÒÅ EasyCalc ÂÅÒ£Ô "\
  	"ÆÏÒÍÁÔ ÞÉÓÅÌ, ×ËÌÀÞÁÑ ÔÏÞËÉ/ÚÁÐÑÔÙÅ/ÐÒÏÂÅÌÙ ÍÅÖÄÕ ÔÙÓÑÞÁÍÉ ÉÚ ÎÁÓÔÒÏÅË PalmOS. ïÂÙÞÎÏ É ÔÏÞËÁ, É ÚÁÐÑÔÁÑ "\
  	"ÒÁÓÐÏÚÎÁÀÔÓÑ ËÁË ÄÅÓÑÔÉÞÎÁÑ ÔÏÞËÁ, ÎÏ ÅÓÌÉ ×ÙÂÒÁÎ ÜÔÏÔ ÐÕÎËÔ, "\
  	"ÒÁÓÐÏÚÎÁ×ÁÔØÓÑ ÂÕÄÅÔ ÔÏÌØËÏ ÏÄÉÎ ÉÚ ÚÎÁËÏ×, - ÔÏÔ, ËÏÔÏÒÙÊ ÏÐÒÅÄÅÌÅÎ × ÎÁÓÔÒÏÊËÁÈ PalmOS. "\
  	"üÔÏ ÍÏÖÅÔ ÂÙÔØ ÐÏÌÅÚÎÏ ÐÒÉ ×ÓÔÁ×ËÅ × EasyCalc ÉÚ ÄÒÕÇÉÈ ÐÒÉÌÏÖÅÎÉÊ.\n\n"\
! 	"äÏÐÏÌÎÉÔÅÌØÎÙÅ ÆÕÎËÃÉÉ - × ÏÂÙÞÎÙÊ ×ÉÄ ÄÏÂÁ×ÌÑÀÔÓÑ ËÎÏÐËÉ ×ÙÚÏ×Á "\
  	"ÎÅËÏÔÏÒÙÈ ÆÕÎËÃÉÊ (sin, ln É Ô.Ä.)."
  
***************
*** 304,309 ****
  	"\n\n"\
  	"äÌÑ ÐÏÌØÚÏ×ÁÔÅÌÅÊ Visor Platinum: ËÁÖÅÔÓÑ, ÜÔÉ ÕÓÔÒÏÊÓÔ×Á ÐÒÏÄÁÀÔÓÑ Ó ÕÖÅ "\
! 	"ÚÁÐÉÓÁÎÎÏÊ × ðúõ MathLib, ÓÌÅÄÏ×ÁÔÅÌØÎÏ, ÎÅÏÂÑÚÁÔÅÌØÎÏ ÕÓÔÁÎÁ×ÌÉ×ÁÔØ ÅÅ × ïúõ. "\
! 	"åÓÌÉ ×Ù ÅÅ ÕÓÔÁÎÏ×ÉÌÉ, ÍÏÖÎÏ ÕÄÁÌÉÔØ ÅÅ, ×ÙÂÒÁ× Applications->Menu->Delete."\
  	"\n\n"\
  	"ðÏÖÁÌÕÊÓÔÁ, ÐÒÏÞÔÉÔÅ ÆÁÊÌ INSTALL, ÅÓÌÉ ×ÁÍ ËÁÖÅÔÓÑ, ÞÔÏ ×Ù ÎÅ ÎÁÈÏÄÉÔÅ "\
--- 306,311 ----
  	"\n\n"\
  	"äÌÑ ÐÏÌØÚÏ×ÁÔÅÌÅÊ Visor Platinum: ËÁÖÅÔÓÑ, ÜÔÉ ÕÓÔÒÏÊÓÔ×Á ÐÒÏÄÁÀÔÓÑ Ó ÕÖÅ "\
! 	"ÚÁÐÉÓÁÎÎÏÊ × ðúõ MathLib, ÓÌÅÄÏ×ÁÔÅÌØÎÏ, ÎÅÏÂÑÚÁÔÅÌØÎÏ ÕÓÔÁÎÁ×ÌÉ×ÁÔØ Å£ × ïúõ. "\
! 	"åÓÌÉ ×Ù ÕÓÔÁÎÏ×ÉÌÉ ÜÔÕ ÂÉÂÌÉÏÔÅËÕ, Å£ ÍÏÖÎÏ ÕÄÁÌÉÔØ, ×ÙÂÒÁ× Applications->Menu->Delete."\
  	"\n\n"\
  	"ðÏÖÁÌÕÊÓÔÁ, ÐÒÏÞÔÉÔÅ ÆÁÊÌ INSTALL, ÅÓÌÉ ×ÁÍ ËÁÖÅÔÓÑ, ÞÔÏ ×Ù ÎÅ ÎÁÈÏÄÉÔÅ "\
***************
*** 326,330 ****
  	"ïÐÒÅÄÅÌÅÎÉÅ ÎÏ×ÏÊ ÆÕÎËÃÉÉ: f()=\"x^2\"\nx - ÁÒÇÕÍÅÎÔ\n\n"\
  	"çÒÁÄÕÓÙ ÍÏÖÅÔÅ ÚÁÄÁ×ÁÔØ ÓÌÅÄÕÀÝÉÍ ÓÐÏÓÏÂÏÍ: 90°30'\n"\
! 	"íÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÓÏËÒÁÝÅÎÎÕÀ ÚÁÐÉÓØ, ÎÁÐÒ. 3pi+4e "\
  	"ÉÌÉ 3sin(x)\n"\
  	"÷ÙÞÉÓÌÅÎÉÅ ËÏÍÐÌÅËÓÎÙÈ ÞÉÓÅÌ íåäìåîîï. ÷ËÌÀÞÁÊÔÅ ÅÇÏ × ÎÁÓÔÒÏÊËÁÈ "\
--- 328,332 ----
  	"ïÐÒÅÄÅÌÅÎÉÅ ÎÏ×ÏÊ ÆÕÎËÃÉÉ: f()=\"x^2\"\nx - ÁÒÇÕÍÅÎÔ\n\n"\
  	"çÒÁÄÕÓÙ ÍÏÖÅÔÅ ÚÁÄÁ×ÁÔØ ÓÌÅÄÕÀÝÉÍ ÓÐÏÓÏÂÏÍ: 90°30'\n"\
! 	"íÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÓÏËÒÁÝ£ÎÎÕÀ ÚÁÐÉÓØ, ÎÁÐÒ. 3pi+4e "\
  	"ÉÌÉ 3sin(x)\n"\
  	"÷ÙÞÉÓÌÅÎÉÅ ËÏÍÐÌÅËÓÎÙÈ ÞÉÓÅÌ íåäìåîîï. ÷ËÌÀÞÁÊÔÅ ÅÇÏ × ÎÁÓÔÒÏÊËÁÈ "\
***************
*** 351,360 ****
  	"along with this program; if not, write to the Free Software "\
  	"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA"\
! 	"\n\n(îÁÕÞÎÙÊ ËÁÌØËÕÌÑÔÏÒ ÄÌÑ PalmOS.\n"\
  	"Copyright (C) 1999-2003, 2006 Ondrej Palkovsky.\n"\
  	"http://easycalc.sourceforge.net\n\n"\
  	"üÔÁ ÐÒÏÇÒÁÍÍÁ - Ó×ÏÂÏÄÎÁÑ: ×Ù ÍÏÖÅÔÅ ÐÅÒÅÄÁ×ÁÔØ É/ÉÌÉ ÉÚÍÅÎÑÔØ Å£ "\
  	"× ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó ïÂÝÅÊ ÏÂÝÅÓÔ×ÅÎÎÏÊ ÌÉÃÅÎÚÉÅÊ GNU, × ÔÏÍ ×ÉÄÅ, "\
! 	"× ËÁËÏÍ Å£ ÏÐÕÂÌÉËÏ×ÁÌ Free Software Foundation; ×Ù ÍÏÖÅÔÅ "\
  	"ÉÓÐÏÌØÚÏ×ÁÔØ ÌÉÃÅÎÚÉÀ ×  ×ÅÒÓÉÉ 2 ÌÉÃÅÎÚÉÉ ÉÌÉ ÌÀÂÕÀ ÂÏÌÅÅ ÐÏÚÄÎÀÀ "\
  	"×ÅÒÓÉÀ.\n\n"\
--- 353,363 ----
  	"along with this program; if not, write to the Free Software "\
  	"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA"\
! 	"\n\n{îÁÕÞÎÙÊ ËÁÌØËÕÌÑÔÏÒ ÄÌÑ PalmOS.\n"\
  	"Copyright (C) 1999-2003, 2006 Ondrej Palkovsky.\n"\
  	"http://easycalc.sourceforge.net\n\n"\
  	"üÔÁ ÐÒÏÇÒÁÍÍÁ - Ó×ÏÂÏÄÎÁÑ: ×Ù ÍÏÖÅÔÅ ÐÅÒÅÄÁ×ÁÔØ É/ÉÌÉ ÉÚÍÅÎÑÔØ Å£ "\
  	"× ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó ïÂÝÅÊ ÏÂÝÅÓÔ×ÅÎÎÏÊ ÌÉÃÅÎÚÉÅÊ GNU, × ÔÏÍ ×ÉÄÅ, "\
! 	"× ËÁËÏÍ Å£ ÏÐÕÂÌÉËÏ×ÁÌ æÏÎÄ ó×ÏÂÏÄÎÏÇÏ ðÒÏÇÒÁÍÍÎÏÇÏ ïÂÅÓÐÅÞÅÎÉÑ "\
! 	"(Free Software Foundation); ×Ù ÍÏÖÅÔÅ "\
  	"ÉÓÐÏÌØÚÏ×ÁÔØ ÌÉÃÅÎÚÉÀ ×  ×ÅÒÓÉÉ 2 ÌÉÃÅÎÚÉÉ ÉÌÉ ÌÀÂÕÀ ÂÏÌÅÅ ÐÏÚÄÎÀÀ "\
  	"×ÅÒÓÉÀ.\n\n"\
***************
*** 362,369 ****
  	"ÎÏ âåúï ÷óñëïê çáòáîôéé; ÄÁÖÅ ÂÅÚ ÎÅÑ×ÎÏÊ ÇÁÒÁÎÉÉ ôï÷áòîïçï ÷éäá "\
  	"ÉÌÉ çïäîïóôé äìñ ïðòåäåì³îîïê ãåìé. äÅÔÁÌÉ ÓÍ. × ïÂÝÅÊ ÏÂÝÅÓÔ×ÅÎÎÏÊ "\
! 	"ÌÉÃÅÎÚÉÉ GNU (ÔÏÌØËÏ ÐÏ-ÁÎÇÌÉÊÓËÉ)\n\n"\
  	"÷Ù ÄÏÌÖÎÙ ÂÙÌÉ ÐÏÌÕÞÉÔØ ËÏÐÉÀ ïÂÝÅÊ ÏÂÝÅÓÔ×ÅÎÎÏÊ ÌÉÃÅÎÚÉÉ GNU ×ÍÅÓÔÅ "\
! 	"Ó ÜÔÏÊ ÐÒÏÇÒÁÍÍÏÊ; ÅÓÌÉ ÎÅÔ, ÏÂÒÁÔÉÔÅÓØ ×Ï Free Software Foundation, Inc., "\
! 	"51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA)"
  
  "$$GRPREF HELP" = "ïÓÎÏ×ÎÙÅ ÎÁÓÔÒÏÊËÉ ÇÒÁÆÉËÏ×."\
--- 365,372 ----
  	"ÎÏ âåúï ÷óñëïê çáòáîôéé; ÄÁÖÅ ÂÅÚ ÎÅÑ×ÎÏÊ ÇÁÒÁÎÉÉ ôï÷áòîïçï ÷éäá "\
  	"ÉÌÉ çïäîïóôé äìñ ïðòåäåì³îîïê ãåìé. äÅÔÁÌÉ ÓÍ. × ïÂÝÅÊ ÏÂÝÅÓÔ×ÅÎÎÏÊ "\
! 	"ÌÉÃÅÎÚÉÉ GNU (GNU General Public License) (ÔÏÌØËÏ ÐÏ-ÁÎÇÌÉÊÓËÉ)\n\n"\
  	"÷Ù ÄÏÌÖÎÙ ÂÙÌÉ ÐÏÌÕÞÉÔØ ËÏÐÉÀ ïÂÝÅÊ ÏÂÝÅÓÔ×ÅÎÎÏÊ ÌÉÃÅÎÚÉÉ GNU ×ÍÅÓÔÅ "\
! 	"Ó ÜÔÏÊ ÐÒÏÇÒÁÍÍÏÊ; ÅÓÌÉ ÎÅÔ, ÏÂÒÁÔÉÔÅÓØ × æÏÎÄ ó×ÏÂÏÄÎÏÇÏ ðÒÏÇÒÁÍÍÎÏÇÏ ïÂÅÓÐÅÞÅÎÉÑ "\
! 	"ÐÏ ÁÄÒÅÓÕ: 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA}"
  
  "$$GRPREF HELP" = "ïÓÎÏ×ÎÙÅ ÎÁÓÔÒÏÊËÉ ÇÒÁÆÉËÏ×."\
***************
*** 372,394 ****
  	"\n\n"\
  	"ðÒÑÍÏÕÇÏÌØÎÙÊ, ðÏÌÑÒÎÙÊ, ðÁÒÁÍÅÔÒÉÞÅÓËÉÊ - ÔÉÐ ÇÒÁÆÉËÁ. ðÒÑÍÏÕÇÏÌØÎÙÊ "\
! 	"- ÏÂÙÞÎÙÊ ÇÒÁÆÉË ÔÉÐÁ y=f(x), ÐÏÌÑÒÎÙÊ ÏÔÏÂÒÁÖÁÅÔ ÒÁÓÓÔÏÑÎÉÅ ÏÔ ÔÏÞËÉ ÇÒÁÆÉËÁ ÄÏ ÎÁÞÁÌÁ ËÏÏÒÄÉÎÁÔ "\
! 	"× ÚÁ×ÉÓÉÍÏÓÔÉ ÏÔ ÕÇÌÁ ÐÏ×ÏÒÏÔÁ, r=f(t), Á ÐÁÒÁÍÅÔÒÉÞÅÓËÉÊ ÇÒÁÆÉË ÏÐÒÅÄÅÌÑÅÔ "\
! 	"ÆÕÎËÃÉÉ X É Y ÏÔ ÔÒÅÔØÅÊ ×ÅÌÉÞÉÎÙ, ÎÁÐÒ. X=t, Y=6t."
  
  "$$GRSETUP HELP" = "÷ÙÂÏÒ ÇÒÁÆÉËÁ, ËÏÔÏÒÙÊ ÈÏÔÉÔÅ ÐÏÓÔÒÏÉÔØ."\
  	"\n\n"\
! 	"ýÅÌËÎÉÔÅ ÐÏ ID ÆÕÎËÃÉÉ (X1,Y1,r1..), ÞÔÏÂÙ ×ÙÂÒÁÔØ ÓÕÝÅÓÔ×ÕÀÝÕÀ ÆÕÎËÃÉÀ.."\
  	"\n\n"\
! 	"ýÅÌËÎÉÔÅ ÐÏ ÉÍÅÎÉ ÆÕÎËÃÉÉ, ÞÔÏÂÙ ÉÚÍÅÎÉÔØ ÅÅ."
  
! "$$FINHELP"	= "ïÐÉÓÁÎÉÅ ÏÓÎÏ×ÎÙÈ ÆÉÎÁÎÓÏ×ÙÈ ÒÁÓÞÅÔÏ×: "\
  	"õ ×ÁÓ ÅÓÔØ ÎÅËÏÔÏÒÁÑ ÓÕÍÍÁ × ÂÁÎËÅ (PV, ÔÅËÕÝÅÅ ÚÎÁÞÅÎÉÅ). X ÒÁÚ × ÇÏÄ (P/YR, "\
! 	"×ÙÐÌÁÔÙ ÚÁ ÇÏÄ) ×ËÌÁÄÙ×ÁÅÔÅ ÎÅËÏÔÏÒÕÀ ÓÕÍÍÕ (PMT, ÐÌÁÔÁ) ÎÁ Ó×ÏÊ ÓÞÅÔ. "\
  	"âÁÎË ÄÏÂÁ×ÌÑÅÔ ËÁÖÄÙÊ ÒÁÚ ÎÅËÏÔÏÒÕÀ ÓÕÍÍÕ - ÐÒÏÃÅÎÔ "\
  	"ÓÕÍÍÙ, ÌÅÖÁÝÅÊ ÎÁ ×ÁÛÅÍ ÓÞÅÔÕ, ËÏÔÏÒÕÀ ÎÁÚÙ×ÁÀÔ ÎÁÞÉÓÌÅÎÉÑÍÉ (IT).\n"\
! 	"ðÏÓÌÅ ÎÅÓËÏÌØËÉÈ ×ÚÎÏÓÏ× (NP, ÞÉÓÌÏ ×ÚÎÏÓÏ×) ÒÅÛÁÅÔÅÓØ ÓÎÑÔØ ÄÅÎØÇÉ ÓÏ ÓÞÅÔÁ. "\
  	"ôÏ, ÞÔÏ ÄÏÓÔÁÎÅÔÅ - ÂÕÄÕÝÁÑ ×ÅÌÉÞÉÎÁ (FV).\n"\
  	"ôÁËÁÑ ÐÏÓÔÁÎÏ×ËÁ ÐÏÄÒÁÚÕÍÅ×ÁÅÔ, ÞÔÏ ÐÅÒÉÏÄ ×ÚÎÏÓÏ× ÒÁ×ÅÎ ×ÒÅÍÅÎÉ, "\
! 	"ÞÅÒÅÚ ËÏÔÏÒÏÅ ÂÁÎË ÐÅÒÅ×ÏÄÉÔ ÎÁÞÉÓÌÅÎÉÑ ÎÁ ×ÁÛ ÓÞÅÔ."\
  	"\n\n" \
  	"!!! ôÁËÁÑ ÐÏÓÔÁÎÏ×ËÁ ÕÞÉÔÙ×ÁÅÔ ÚÎÁË ×ÚÎÏÓÏ×. îÁÐÒÉÍÅÒ, " \
--- 375,398 ----
  	"\n\n"\
  	"ðÒÑÍÏÕÇÏÌØÎÙÊ, ðÏÌÑÒÎÙÊ, ðÁÒÁÍÅÔÒÉÞÅÓËÉÊ - ÔÉÐ ÇÒÁÆÉËÁ. ðÒÑÍÏÕÇÏÌØÎÙÊ "\
! 	"- ÏÂÙÞÎÙÊ ÇÒÁÆÉË ÔÉÐÁ y=f(x);"\
! 	" ÐÏÌÑÒÎÙÊ ÏÔÏÂÒÁÖÁÅÔ ÒÁÓÓÔÏÑÎÉÅ ÏÔ ÔÏÞËÉ ÇÒÁÆÉËÁ ÄÏ ÎÁÞÁÌÁ ËÏÏÒÄÉÎÁÔ "\
! 	"× ÚÁ×ÉÓÉÍÏÓÔÉ ÏÔ ÕÇÌÁ ÐÏ×ÏÒÏÔÁ, r=f(t); ÐÁÒÁÍÅÔÒÉÞÅÓËÉÊ ÇÒÁÆÉË ÏÐÒÅÄÅÌÑÅÔ "\
! 	"X É Y ËÁË ÆÕÎËÃÉÉ ÔÒÅÔØÅÊ ×ÅÌÉÞÉÎÙ, ÎÁÐÒ. X=t, Y=6t."
  
  "$$GRSETUP HELP" = "÷ÙÂÏÒ ÇÒÁÆÉËÁ, ËÏÔÏÒÙÊ ÈÏÔÉÔÅ ÐÏÓÔÒÏÉÔØ."\
  	"\n\n"\
! 	"ý£ÌËÎÉÔÅ ÐÏ ID ÆÕÎËÃÉÉ (X1,Y1,r1..), ÞÔÏÂÙ ×ÙÂÒÁÔØ ÓÕÝÅÓÔ×ÕÀÝÕÀ ÆÕÎËÃÉÀ.."\
  	"\n\n"\
! 	"ý£ÌËÎÉÔÅ ÐÏ ÉÍÅÎÉ ÆÕÎËÃÉÉ, ÞÔÏÂÙ ÉÚÍÅÎÉÔØ Å£."
  
! "$$FINHELP"	= "ïÐÉÓÁÎÉÅ ÏÓÎÏ×ÎÙÈ ÆÉÎÁÎÓÏ×ÙÈ ÒÁÓÞ£ÔÏ×: "\
  	"õ ×ÁÓ ÅÓÔØ ÎÅËÏÔÏÒÁÑ ÓÕÍÍÁ × ÂÁÎËÅ (PV, ÔÅËÕÝÅÅ ÚÎÁÞÅÎÉÅ). X ÒÁÚ × ÇÏÄ (P/YR, "\
! 	"×ÙÐÌÁÔÙ ÚÁ ÇÏÄ) ×ËÌÁÄÙ×ÁÅÔÅ ÎÅËÏÔÏÒÕÀ ÓÕÍÍÕ (PMT, ÐÌÁÔÁ) ÎÁ Ó×ÏÊ ÓÞ£Ô. "\
  	"âÁÎË ÄÏÂÁ×ÌÑÅÔ ËÁÖÄÙÊ ÒÁÚ ÎÅËÏÔÏÒÕÀ ÓÕÍÍÕ - ÐÒÏÃÅÎÔ "\
  	"ÓÕÍÍÙ, ÌÅÖÁÝÅÊ ÎÁ ×ÁÛÅÍ ÓÞÅÔÕ, ËÏÔÏÒÕÀ ÎÁÚÙ×ÁÀÔ ÎÁÞÉÓÌÅÎÉÑÍÉ (IT).\n"\
! 	"ðÏÓÌÅ ÎÅÓËÏÌØËÉÈ ×ÚÎÏÓÏ× (NP, ÞÉÓÌÏ ×ÚÎÏÓÏ×) ÒÅÛÁÅÔÅÓØ ÓÎÑÔØ ÄÅÎØÇÉ ÓÏ ÓÞ£ÔÁ. "\
  	"ôÏ, ÞÔÏ ÄÏÓÔÁÎÅÔÅ - ÂÕÄÕÝÁÑ ×ÅÌÉÞÉÎÁ (FV).\n"\
  	"ôÁËÁÑ ÐÏÓÔÁÎÏ×ËÁ ÐÏÄÒÁÚÕÍÅ×ÁÅÔ, ÞÔÏ ÐÅÒÉÏÄ ×ÚÎÏÓÏ× ÒÁ×ÅÎ ×ÒÅÍÅÎÉ, "\
! 	"ÞÅÒÅÚ ËÏÔÏÒÏÅ ÂÁÎË ÐÅÒÅ×ÏÄÉÔ ÎÁÞÉÓÌÅÎÉÑ ÎÁ ×ÁÛ ÓÞ£Ô."\
  	"\n\n" \
  	"!!! ôÁËÁÑ ÐÏÓÔÁÎÏ×ËÁ ÕÞÉÔÙ×ÁÅÔ ÚÎÁË ×ÚÎÏÓÏ×. îÁÐÒÉÍÅÒ, " \
***************
*** 398,404 ****
  
  "$$MEMOHELP" = "÷ÙÂÅÒÉÔÅ ÚÁÐÉÓØ ÉÚ ÓÐÉÓËÁ É ÎÁÖÍÉÔÅ 'ôÁË'"\
! 	"ÄÌÑ ÅÇÏ ×ÙÐÏÌÎÅÎÉÑ. "\
  	"ðÅÒ×ÁÑ ÓÔÒÏËÁ (ÚÁÇÏÌÏ×ÏË) ÎÅ ×ÙÐÏÌÎÑÅÔÓÑ. úÁÐÉÓØ ×ÙÐÏÌÎÑÅÔÓÑ, ËÁË ÅÓÌÉ ÂÙ "\
! 	"ÅÇÏ ××ÏÄÉÌÉ ÓÔÒÏËÁ ÚÁ ÓÔÒÏËÏÊ × ËÁÌØËÕÌÑÔÏÒ.\n\n"\
  	"åÓÌÉ × ÚÁÐÉÓÎÏÊ ËÎÉÖËÅ ÅÓÔØ ËÁÔÅÇÏÒÉÑ 'EasyCalc', ÔÏ ÐÏËÁÚÙ×ÁÀÔÓÑ "\
  	"ÚÁÐÉÓÉ ÔÏÌØËÏ ÉÚ ÜÔÏÊ ËÁÔÅÇÏÒÉÉ."
--- 402,408 ----
  
  "$$MEMOHELP" = "÷ÙÂÅÒÉÔÅ ÚÁÐÉÓØ ÉÚ ÓÐÉÓËÁ É ÎÁÖÍÉÔÅ 'ôÁË'"\
! 	"ÄÌÑ Å£ ×ÙÐÏÌÎÅÎÉÑ. "\
  	"ðÅÒ×ÁÑ ÓÔÒÏËÁ (ÚÁÇÏÌÏ×ÏË) ÎÅ ×ÙÐÏÌÎÑÅÔÓÑ. úÁÐÉÓØ ×ÙÐÏÌÎÑÅÔÓÑ, ËÁË ÅÓÌÉ ÂÙ "\
! 	"Å£ ××ÏÄÉÌÉ ÓÔÒÏËÁ ÚÁ ÓÔÒÏËÏÊ × ËÁÌØËÕÌÑÔÏÒ.\n\n"\
  	"åÓÌÉ × ÚÁÐÉÓÎÏÊ ËÎÉÖËÅ ÅÓÔØ ËÁÔÅÇÏÒÉÑ 'EasyCalc', ÔÏ ÐÏËÁÚÙ×ÁÀÔÓÑ "\
  	"ÚÁÐÉÓÉ ÔÏÌØËÏ ÉÚ ÜÔÏÊ ËÁÔÅÇÏÒÉÉ."

Index: ru_win.rcp
===================================================================
RCS file: /cvsroot/easycalc/easycalc/langs/ru_win.rcp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ru_win.rcp	22 Sep 2006 20:05:14 -0000	1.14
--- ru_win.rcp	28 Dec 2006 03:18:49 -0000	1.15
***************
*** 1,3 ****
--- 1,7 ----
   
+  
+  
+  
+  
  
  TRANSLATION "ru_win"
***************
*** 33,37 ****
  "$$SHOW UNITS"		=	"Ïîêàçûâàòü åäèíèöû       "
  "$$INSERT HELP"		=	"Âñòàâ.ñïðàâêó"
! "$$PALM NUM PREFS"	=	"÷èñë.íàñòð.PDA"
  "$$DISP SCIEN"		=	"Äîïîëíèòåëüíûå ôóíêöèè          "
  
--- 37,41 ----
  "$$SHOW UNITS"		=	"Ïîêàçûâàòü åäèíèöû       "
  "$$INSERT HELP"		=	"Âñòàâ.ñïðàâêó"
! "$$PALM NUM PREFS"	=	"÷èñë.íàñòð.ÊÏÊ   "
  "$$DISP SCIEN"		=	"Äîïîëíèòåëüíûå ôóíêöèè          "
  
***************
*** 84,88 ****
  "$$SOLVER"		=	"Ðåøåíèå"
  "$$UPDATE"		=	"Îáíîâè"
! "$$OPTIONS"		=	"Ïàðàìåòðû"
  "$$NOTE"		=	"Ïðèìå÷."
  "$$NEW WORKSHEET"	=	"Íîâûé ëèñò"
--- 88,92 ----
  "$$SOLVER"		=	"Ðåøåíèå"
  "$$UPDATE"		=	"Îáíîâè"
! "$$OPTIONS"		=	"Ïàðàì."
  "$$NOTE"		=	"Ïðèìå÷."
  "$$NEW WORKSHEET"	=	"Íîâûé ëèñò"
***************
*** 108,112 ****
  "$$PREFERENCES..."	=	"Íàñòðîéêè..."
  "$$DEFINITION..."	=	"Îïðåäåëåíèÿ..."
! "$$FINANCIAL..."	=	"Ôèíàíñîâûå ðàñ÷åòû...    "
  /**************************************************/
  "$$SOLVER..."           =       "Ðåøåíèå..."
--- 112,116 ----
  "$$PREFERENCES..."	=	"Íàñòðîéêè..."
  "$$DEFINITION..."	=	"Îïðåäåëåíèÿ..."
! "$$FINANCIAL..."	=	"Ôèíàíñîâûå ðàñ÷¸òû...    "
  /**************************************************/
  "$$SOLVER..."           =       "Ðåøåíèå..."
***************
*** 133,137 ****
  
  "$$DELETE TITLE"	=	"Ïîäòâåðäèòå óäàëåíèå"
! "$$DELETE MSG"		=	"Óäàëèòü íàñîâñåì  ^1 '^2'?"
  "$$DELETE"		=	"Óäàëèòü"
  
--- 137,141 ----
  
  "$$DELETE TITLE"	=	"Ïîäòâåðäèòå óäàëåíèå"
! "$$DELETE MSG"		=	"^1 '^2' óäàëÿåòñÿ?"
  "$$DELETE"		=	"Óäàëèòü"
  
***************
*** 188,192 ****
  "$$GRAPH COMPUTING RESULT" = 	"Ðåçóëüòàò ãðàôè÷åñêèõ âû÷èñëåíèé"
  "$$COMPUTING"		=	"Âû÷èñëåíèå"
! "$$COMPCONFIRM"		=	"Ðàñ÷åò çàéìåò íåêîòîðîå âðåìÿ. Íàæìèòå ÒÀÊ äëÿ íà÷àëà âû÷èñëåíèé"
  "$$COMPRESULT"		=	"^1 ôóíêöèè: ^2"
  "$$LEFTBOUND"		=	"Âûáåðèòå ëåâóþ ãðàíèöó èíòåðâàëà è íàæìèòå 'C'."
--- 192,196 ----
  "$$GRAPH COMPUTING RESULT" = 	"Ðåçóëüòàò ãðàôè÷åñêèõ âû÷èñëåíèé"
  "$$COMPUTING"		=	"Âû÷èñëåíèå"
! "$$COMPCONFIRM"		=	"Ðàñ÷¸ò çàéì¸ò íåêîòîðîå âðåìÿ. Íàæìèòå ÒÀÊ äëÿ íà÷àëà âû÷èñëåíèé"
  "$$COMPRESULT"		=	"^1 ôóíêöèè: ^2"
  "$$LEFTBOUND"		=	"Âûáåðèòå ëåâóþ ãðàíèöó èíòåðâàëà è íàæìèòå 'C'."
***************
*** 232,236 ****
  "$$TABLE MODE"		=	"Òàáëè÷íûé ðåæèì"
  "$$GOTO"		=	"Èäòè íà"
! "$$STEP"		=	"Step"
  "$$GO"			=	"Èäòè"
  "$$SETUP GRAPHS..."	=	"Âûáîð ãðàôèêà..."
--- 236,240 ----
  "$$TABLE MODE"		=	"Òàáëè÷íûé ðåæèì"
  "$$GOTO"		=	"Èäòè íà"
! "$$STEP"		=	"Øàã"
  "$$GO"			=	"Èäòè"
  "$$SETUP GRAPHS..."	=	"Âûáîð ãðàôèêà..."
***************
*** 279,282 ****
--- 283,288 ----
  	"ëåãêî îòîáðàæàþòñÿ â äâîè÷íîé ôîðìå. "\
  	"\n\n"\
+ 	"Îáû÷íûé, íàó÷íûé, èíæåíåðíûé: ôîðìàòû îòîáðàæåíèÿ ðåçóëüòàòà "\
+ 	"(íàïðèìåð, â íàó÷íîì - '1.23E4', â îáû÷íîì - '1,230', â èíæåíåðíîì - '1.23K')\n\n"\
  	"Ïîêàçûâàòü åäèíèöû - â èíæåíåðíîì ðåæèìå âûâîä, íàïðèìåð, "\
  	"10E3, êàê 10K è ò.ä. Êîíå÷íî, âû ìîæåòå èñïîëüçîâàòü ýòè åäèíèöû ïðè "\
***************
*** 286,295 ****
  	"ïðÿìî â ñòðîêó ââîäà."\
  	"\n\n"\
! 	"÷èñë. íàñòð. PDA - ïðè âûáîðå EasyCalc áåð¸ò "\
  	"ôîðìàò ÷èñåë, âêëþ÷àÿ òî÷êè/çàïÿòûå/ïðîáåëû ìåæäó òûñÿ÷àìè èç íàñòðîåê PalmOS. Îáû÷íî è òî÷êà, è çàïÿòàÿ "\
  	"ðàñïîçíàþòñÿ êàê äåñÿòè÷íàÿ òî÷êà, íî åñëè âûáðàí ýòîò ïóíêò, "\
  	"ðàñïîçíàâàòüñÿ áóäåò òîëüêî îäèí èç çíàêîâ, - òîò, êîòîðûé îïðåäåëåí â íàñòðîéêàõ PalmOS. "\
  	"Ýòî ìîæåò áûòü ïîëåçíî ïðè âñòàâêå â EasyCalc èç äðóãèõ ïðèëîæåíèé.\n\n"\
! 	"Íàó÷íûå ôóíêöèè - â îáû÷íûé âèä äîáàâëÿþòñÿ êíîïêè âûçîâà "\
  	"íåêîòîðûõ ôóíêöèé (sin, ln è ò.ä.)."
  
--- 292,301 ----
  	"ïðÿìî â ñòðîêó ââîäà."\
  	"\n\n"\
! 	"÷èñë. íàñòð. ÊÏÊ - ïðè âûáîðå EasyCalc áåð¸ò "\
  	"ôîðìàò ÷èñåë, âêëþ÷àÿ òî÷êè/çàïÿòûå/ïðîáåëû ìåæäó òûñÿ÷àìè èç íàñòðîåê PalmOS. Îáû÷íî è òî÷êà, è çàïÿòàÿ "\
  	"ðàñïîçíàþòñÿ êàê äåñÿòè÷íàÿ òî÷êà, íî åñëè âûáðàí ýòîò ïóíêò, "\
  	"ðàñïîçíàâàòüñÿ áóäåò òîëüêî îäèí èç çíàêîâ, - òîò, êîòîðûé îïðåäåëåí â íàñòðîéêàõ PalmOS. "\
  	"Ýòî ìîæåò áûòü ïîëåçíî ïðè âñòàâêå â EasyCalc èç äðóãèõ ïðèëîæåíèé.\n\n"\
! 	"Äîïîëíèòåëüíûå ôóíêöèè - â îáû÷íûé âèä äîáàâëÿþòñÿ êíîïêè âûçîâà "\
  	"íåêîòîðûõ ôóíêöèé (sin, ln è ò.ä.)."
  
***************
*** 305,310 ****
  	"\n\n"\
  	"Äëÿ ïîëüçîâàòåëåé Visor Platinum: êàæåòñÿ, ýòè óñòðîéñòâà ïðîäàþòñÿ ñ óæå "\
! 	"çàïèñàííîé â ÏÇÓ MathLib, ñëåäîâàòåëüíî, íåîáÿçàòåëüíî óñòàíàâëèâàòü åå â ÎÇÓ. "\
! 	"Åñëè âû åå óñòàíîâèëè, ìîæíî óäàëèòü åå, âûáðàâ Applications->Menu->Delete."\
  	"\n\n"\
  	"Ïîæàëóéñòà, ïðî÷òèòå ôàéë INSTALL, åñëè âàì êàæåòñÿ, ÷òî âû íå íàõîäèòå "\
--- 311,316 ----
  	"\n\n"\
  	"Äëÿ ïîëüçîâàòåëåé Visor Platinum: êàæåòñÿ, ýòè óñòðîéñòâà ïðîäàþòñÿ ñ óæå "\
! 	"çàïèñàííîé â ÏÇÓ MathLib, ñëåäîâàòåëüíî, íåîáÿçàòåëüíî óñòàíàâëèâàòü å¸ â ÎÇÓ. "\
! 	"Åñëè âû óñòàíîâèëè ýòó áèáëèîòåêó, å¸ ìîæíî óäàëèòü, âûáðàâ Applications->Menu->Delete."\
  	"\n\n"\
  	"Ïîæàëóéñòà, ïðî÷òèòå ôàéë INSTALL, åñëè âàì êàæåòñÿ, ÷òî âû íå íàõîäèòå "\
***************
*** 327,331 ****
  	"Îïðåäåëåíèå íîâîé ôóíêöèè: f()=\"x^2\"\nx - àðãóìåíò\n\n"\
  	"Ãðàäóñû ìîæåòå çàäàâàòü ñëåäóþùèì ñïîñîáîì: 90°30'\n"\
! 	"Ìîæíî èñïîëüçîâàòü ñîêðàùåííóþ çàïèñü, íàïð. 3pi+4e "\
  	"èëè 3sin(x)\n"\
  	"Âû÷èñëåíèå êîìïëåêñíûõ ÷èñåë ÌÅÄËÅÍÍÎ. Âêëþ÷àéòå åãî â íàñòðîéêàõ "\
--- 333,337 ----
  	"Îïðåäåëåíèå íîâîé ôóíêöèè: f()=\"x^2\"\nx - àðãóìåíò\n\n"\
  	"Ãðàäóñû ìîæåòå çàäàâàòü ñëåäóþùèì ñïîñîáîì: 90°30'\n"\
! 	"Ìîæíî èñïîëüçîâàòü ñîêðàù¸ííóþ çàïèñü, íàïð. 3pi+4e "\
  	"èëè 3sin(x)\n"\
  	"Âû÷èñëåíèå êîìïëåêñíûõ ÷èñåë ÌÅÄËÅÍÍÎ. Âêëþ÷àéòå åãî â íàñòðîéêàõ "\
***************
*** 352,361 ****
  	"along with this program; if not, write to the Free Software "\
  	"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA"\
! 	"\n\n(Íàó÷íûé êàëüêóëÿòîð äëÿ PalmOS.\n"\
  	"Copyright (C) 1999-2003, 2006 Ondrej Palkovsky.\n"\
  	"http://easycalc.sourceforge.net\n\n"\
  	"Ýòà ïðîãðàììà - ñâîáîäíàÿ: âû ìîæåòå ïåðåäàâàòü è/èëè èçìåíÿòü å¸ "\
  	"â ñîîòâåòñòâèè ñ Îáùåé îáùåñòâåííîé ëèöåíçèåé GNU, â òîì âèäå, "\
! 	"â êàêîì å¸ îïóáëèêîâàë Free Software Foundation; âû ìîæåòå "\
  	"èñïîëüçîâàòü ëèöåíçèþ â  âåðñèè 2 ëèöåíçèè èëè ëþáóþ áîëåå ïîçäíþþ "\
  	"âåðñèþ.\n\n"\
--- 358,368 ----
  	"along with this program; if not, write to the Free Software "\
  	"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA"\
! 	"\n\n{Íàó÷íûé êàëüêóëÿòîð äëÿ PalmOS.\n"\
  	"Copyright (C) 1999-2003, 2006 Ondrej Palkovsky.\n"\
  	"http://easycalc.sourceforge.net\n\n"\
  	"Ýòà ïðîãðàììà - ñâîáîäíàÿ: âû ìîæåòå ïåðåäàâàòü è/èëè èçìåíÿòü å¸ "\
  	"â ñîîòâåòñòâèè ñ Îáùåé îáùåñòâåííîé ëèöåíçèåé GNU, â òîì âèäå, "\
! 	"â êàêîì å¸ îïóáëèêîâàë Ôîíä Ñâîáîäíîãî Ïðîãðàììíîãî Îáåñïå÷åíèÿ "\
! 	"(Free Software Foundation); âû ìîæåòå "\
  	"èñïîëüçîâàòü ëèöåíçèþ â  âåðñèè 2 ëèöåíçèè èëè ëþáóþ áîëåå ïîçäíþþ "\
  	"âåðñèþ.\n\n"\
***************
*** 363,370 ****
  	"íî ÁÅÇÎ ÂÑßÊÎÉ ÃÀÐÀÍÒÈÈ; äàæå áåç íåÿâíîé ãàðàíèè ÒÎÂÀÐÍÎÃÎ ÂÈÄÀ "\
  	"èëè ÃÎÄÍÎÑÒÈ ÄËß ÎÏÐÅÄÅË¨ÍÍÎÉ ÖÅËÈ. Äåòàëè ñì. â Îáùåé îáùåñòâåííîé "\
! 	"ëèöåíçèè GNU (òîëüêî ïî-àíãëèéñêè)\n\n"\
  	"Âû äîëæíû áûëè ïîëó÷èòü êîïèþ Îáùåé îáùåñòâåííîé ëèöåíçèè GNU âìåñòå "\
! 	"ñ ýòîé ïðîãðàììîé; åñëè íåò, îáðàòèòåñü âî Free Software Foundation, Inc., "\
! 	"51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA)"
  
  "$$GRPREF HELP" = "Îñíîâíûå íàñòðîéêè ãðàôèêîâ."\
--- 370,377 ----
  	"íî ÁÅÇÎ ÂÑßÊÎÉ ÃÀÐÀÍÒÈÈ; äàæå áåç íåÿâíîé ãàðàíèè ÒÎÂÀÐÍÎÃÎ ÂÈÄÀ "\
  	"èëè ÃÎÄÍÎÑÒÈ ÄËß ÎÏÐÅÄÅË¨ÍÍÎÉ ÖÅËÈ. Äåòàëè ñì. â Îáùåé îáùåñòâåííîé "\
! 	"ëèöåíçèè GNU (GNU General Public License) (òîëüêî ïî-àíãëèéñêè)\n\n"\
  	"Âû äîëæíû áûëè ïîëó÷èòü êîïèþ Îáùåé îáùåñòâåííîé ëèöåíçèè GNU âìåñòå "\
! 	"ñ ýòîé ïðîãðàììîé; åñëè íåò, îáðàòèòåñü â Ôîíä Ñâîáîäíîãî Ïðîãðàììíîãî Îáåñïå÷åíèÿ "\
! 	"ïî àäðåñó: 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA}"
  
  "$$GRPREF HELP" = "Îñíîâíûå íàñòðîéêè ãðàôèêîâ."\
***************
*** 373,395 ****
  	"\n\n"\
  	"Ïðÿìîóãîëüíûé, Ïîëÿðíûé, Ïàðàìåòðè÷åñêèé - òèï ãðàôèêà. Ïðÿìîóãîëüíûé "\
! 	"- îáû÷íûé ãðàôèê òèïà y=f(x), ïîëÿðíûé îòîáðàæàåò ðàññòîÿíèå îò òî÷êè ãðàôèêà äî íà÷àëà êîîðäèíàò "\
! 	"â çàâèñèìîñòè îò óãëà ïîâîðîòà, r=f(t), à ïàðàìåòðè÷åñêèé ãðàôèê îïðåäåëÿåò "\
! 	"ôóíêöèè X è Y îò òðåòüåé âåëè÷èíû, íàïð. X=t, Y=6t."
  
  "$$GRSETUP HELP" = "Âûáîð ãðàôèêà, êîòîðûé õîòèòå ïîñòðîèòü."\
  	"\n\n"\
! 	"Ùåëêíèòå ïî ID ôóíêöèè (X1,Y1,r1..), ÷òîáû âûáðàòü ñóùåñòâóþùóþ ôóíêöèþ.."\
  	"\n\n"\
! 	"Ùåëêíèòå ïî èìåíè ôóíêöèè, ÷òîáû èçìåíèòü åå."
  
! "$$FINHELP"	= "Îïèñàíèå îñíîâíûõ ôèíàíñîâûõ ðàñ÷åòîâ: "\
  	"Ó âàñ åñòü íåêîòîðàÿ ñóììà â áàíêå (PV, òåêóùåå çíà÷åíèå). X ðàç â ãîä (P/YR, "\
! 	"âûïëàòû çà ãîä) âêëàäûâàåòå íåêîòîðóþ ñóììó (PMT, ïëàòà) íà ñâîé ñ÷åò. "\
  	"Áàíê äîáàâëÿåò êàæäûé ðàç íåêîòîðóþ ñóììó - ïðîöåíò "\
  	"ñóììû, ëåæàùåé íà âàøåì ñ÷åòó, êîòîðóþ íàçûâàþò íà÷èñëåíèÿìè (IT).\n"\
! 	"Ïîñëå íåñêîëüêèõ âçíîñîâ (NP, ÷èñëî âçíîñîâ) ðåøàåòåñü ñíÿòü äåíüãè ñî ñ÷åòà. "\
  	"Òî, ÷òî äîñòàíåòå - áóäóùàÿ âåëè÷èíà (FV).\n"\
  	"Òàêàÿ ïîñòàíîâêà ïîäðàçóìåâàåò, ÷òî ïåðèîä âçíîñîâ ðàâåí âðåìåíè, "\
! 	"÷åðåç êîòîðîå áàíê ïåðåâîäèò íà÷èñëåíèÿ íà âàø ñ÷åò."\
  	"\n\n" \
  	"!!! Òàêàÿ ïîñòàíîâêà ó÷èòûâàåò çíàê âçíîñîâ. Íàïðèìåð, " \
--- 380,403 ----
  	"\n\n"\
  	"Ïðÿìîóãîëüíûé, Ïîëÿðíûé, Ïàðàìåòðè÷åñêèé - òèï ãðàôèêà. Ïðÿìîóãîëüíûé "\
! 	"- îáû÷íûé ãðàôèê òèïà y=f(x);"\
! 	" ïîëÿðíûé îòîáðàæàåò ðàññòîÿíèå îò òî÷êè ãðàôèêà äî íà÷àëà êîîðäèíàò "\
! 	"â çàâèñèìîñòè îò óãëà ïîâîðîòà, r=f(t); ïàðàìåòðè÷åñêèé ãðàôèê îïðåäåëÿåò "\
! 	"X è Y êàê ôóíêöèè òðåòüåé âåëè÷èíû, íàïð. X=t, Y=6t."
  
  "$$GRSETUP HELP" = "Âûáîð ãðàôèêà, êîòîðûé õîòèòå ïîñòðîèòü."\
  	"\n\n"\
! 	"Ù¸ëêíèòå ïî ID ôóíêöèè (X1,Y1,r1..), ÷òîáû âûáðàòü ñóùåñòâóþùóþ ôóíêöèþ.."\
  	"\n\n"\
! 	"Ù¸ëêíèòå ïî èìåíè ôóíêöèè, ÷òîáû èçìåíèòü å¸."
  
! "$$FINHELP"	= "Îïèñàíèå îñíîâíûõ ôèíàíñîâûõ ðàñ÷¸òîâ: "\
  	"Ó âàñ åñòü íåêîòîðàÿ ñóììà â áàíêå (PV, òåêóùåå çíà÷åíèå). X ðàç â ãîä (P/YR, "\
! 	"âûïëàòû çà ãîä) âêëàäûâàåòå íåêîòîðóþ ñóììó (PMT, ïëàòà) íà ñâîé ñ÷¸ò. "\
  	"Áàíê äîáàâëÿåò êàæäûé ðàç íåêîòîðóþ ñóììó - ïðîöåíò "\
  	"ñóììû, ëåæàùåé íà âàøåì ñ÷åòó, êîòîðóþ íàçûâàþò íà÷èñëåíèÿìè (IT).\n"\
! 	"Ïîñëå íåñêîëüêèõ âçíîñîâ (NP, ÷èñëî âçíîñîâ) ðåøàåòåñü ñíÿòü äåíüãè ñî ñ÷¸òà. "\
  	"Òî, ÷òî äîñòàíåòå - áóäóùàÿ âåëè÷èíà (FV).\n"\
  	"Òàêàÿ ïîñòàíîâêà ïîäðàçóìåâàåò, ÷òî ïåðèîä âçíîñîâ ðàâåí âðåìåíè, "\
! 	"÷åðåç êîòîðîå áàíê ïåðåâîäèò íà÷èñëåíèÿ íà âàø ñ÷¸ò."\
  	"\n\n" \
  	"!!! Òàêàÿ ïîñòàíîâêà ó÷èòûâàåò çíàê âçíîñîâ. Íàïðèìåð, " \
***************
*** 399,405 ****
  
  "$$MEMOHELP" = "Âûáåðèòå çàïèñü èç ñïèñêà è íàæìèòå 'Òàê'"\
! 	"äëÿ åãî âûïîëíåíèÿ. "\
  	"Ïåðâàÿ ñòðîêà (çàãîëîâîê) íå âûïîëíÿåòñÿ. Çàïèñü âûïîëíÿåòñÿ, êàê åñëè áû "\
! 	"åãî ââîäèëè ñòðîêà çà ñòðîêîé â êàëüêóëÿòîð.\n\n"\
  	"Åñëè â çàïèñíîé êíèæêå åñòü êàòåãîðèÿ 'EasyCalc', òî ïîêàçûâàþòñÿ "\
  	"çàïèñè òîëüêî èç ýòîé êàòåãîðèè."
--- 407,413 ----
  
  "$$MEMOHELP" = "Âûáåðèòå çàïèñü èç ñïèñêà è íàæìèòå 'Òàê'"\
! 	"äëÿ å¸ âûïîëíåíèÿ. "\
  	"Ïåðâàÿ ñòðîêà (çàãîëîâîê) íå âûïîëíÿåòñÿ. Çàïèñü âûïîëíÿåòñÿ, êàê åñëè áû "\
! 	"å¸ ââîäèëè ñòðîêà çà ñòðîêîé â êàëüêóëÿòîð.\n\n"\
  	"Åñëè â çàïèñíîé êíèæêå åñòü êàòåãîðèÿ 'EasyCalc', òî ïîêàçûâàþòñÿ "\
  	"çàïèñè òîëüêî èç ýòîé êàòåãîðèè."
***************
*** 442,446 ****
  	"âûáèðàåòå ïåðåìåííóþ â ñïèñêå.\n\n"\
  	"Ïðè ðåøåíèè óðàâíåíèé èñïîëüçóåòñÿ ôóíêöèÿ fzero(); âû ìîæåòå "\
! 	"èçìåíÿòü ïàðàìåòðû íàæàòèåì íà êíîïêó 'Ïàðàìåòðû'."
  
  END
--- 450,454 ----
  	"âûáèðàåòå ïåðåìåííóþ â ñïèñêå.\n\n"\
  	"Ïðè ðåøåíèè óðàâíåíèé èñïîëüçóåòñÿ ôóíêöèÿ fzero(); âû ìîæåòå "\
! 	"èçìåíÿòü ïàðàìåòðû íàæàòèåì íà êíîïêó 'Ïàðàì.'."
  
  END

[Easycalc-commits] easycalc graph.c, 1.54, 1.55 grprefs.c, 1.26, 1.27 grprefs.h, 1.13, 1.14

From: Ton v. O. <tvo...@us...> - 2006-12-28 03:16:29

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

Modified Files:
	graph.c grprefs.c grprefs.h 
Log Message:
Increase size of colors array in graphPrefs to 9 to eliminate overlap with grEnable since
there really are 9 colors (6 funs + axis + grid + background).
Bumped PREF_GRAPH_VERSION since size of graphPrefs has changed since 1.24.
Draw axes using the correct color (axis color was ignored before).
Thanks to Jorge Gil for catching this.


Index: grprefs.h
===================================================================
RCS file: /cvsroot/easycalc/easycalc/grprefs.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** grprefs.h	10 Nov 2006 04:12:56 -0000	1.13
--- grprefs.h	28 Dec 2006 03:16:17 -0000	1.14
***************
*** 50,54 ****
  	Boolean logx,logy;
  	Int16 speed;
! 	IndexedColorType colors[8];
  	Boolean grEnable[9];
  	Int8 grType[6];
--- 50,54 ----
  	Boolean logx,logy;
  	Int16 speed;
! 	IndexedColorType colors[9];
  	Boolean grEnable[9];
  	Int8 grType[6];

Index: graph.c
===================================================================
RCS file: /cvsroot/easycalc/easycalc/graph.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** graph.c	10 Nov 2006 04:12:56 -0000	1.54
--- graph.c	28 Dec 2006 03:16:16 -0000	1.55
***************
*** 487,492 ****
  	graph_setcolor(-1);
  	clie_eraserectangle(&natbounds,0);
- 	graph_unsetcolor();
- 
  	if (graphPrefs.grEnable[6]) { /* axes drawing enabled */
  		/* y axis */
--- 487,490 ----
***************
*** 498,524 ****
  		if (y>ScrPrefs.ymax && y<ScrPrefs.ymin)
  			clie_drawline(ScrPrefs.xmin,y,ScrPrefs.xmax,y);
! 		/* draw axes labels */
! 		if (graphPrefs.grEnable[8]) { /* axes labels enabled */
! 			Coord dy1 = HanderaCoord(-11);
! 			Coord dy2 = HanderaCoord(-1);
! 			Coord dy3 = HanderaCoord(-10);
! 			Coord dy4 = HanderaCoord(-1);
  
! 			grtaps_print_val("ymin:",graphPrefs.ymin,
! 			                 stdbounds.topLeft.x + stdbounds.extent.x/2,
! 			                 stdbounds.topLeft.y + stdbounds.extent.y + dy1,
! 			                 align_center);
! 			grtaps_print_val("ymax:",graphPrefs.ymax,
! 			                 stdbounds.topLeft.x + stdbounds.extent.x/2,
! 			                 stdbounds.topLeft.y + dy2, align_center);
! 			grtaps_print_val("xmin:",graphPrefs.xmin,
! 			                 stdbounds.topLeft.x,
! 			                 stdbounds.topLeft.y + stdbounds.extent.y/2 + dy3,
! 			                 align_left);
! 			grtaps_print_val("xmax:",graphPrefs.xmax,
! 			                 stdbounds.topLeft.x + stdbounds.extent.x,
! 			                 stdbounds.topLeft.y + stdbounds.extent.y/2 + dy4,
! 			                 align_right);
! 		}
  	}
  
--- 496,524 ----
  		if (y>ScrPrefs.ymax && y<ScrPrefs.ymin)
  			clie_drawline(ScrPrefs.xmin,y,ScrPrefs.xmax,y);
! 	}
! 	graph_unsetcolor();
  
! 	/* Draw axes labels */
! 	if (graphPrefs.grEnable[6] && graphPrefs.grEnable[8]) { /* axes and labels enabled */
! 		Coord dy1 = HanderaCoord(-11);
! 		Coord dy2 = HanderaCoord(-1);
! 		Coord dy3 = HanderaCoord(-10);
! 		Coord dy4 = HanderaCoord(-1);
! 
! 		grtaps_print_val("ymin:",graphPrefs.ymin,
! 		                 stdbounds.topLeft.x + stdbounds.extent.x/2,
! 		                 stdbounds.topLeft.y + stdbounds.extent.y + dy1,
! 		                 align_center);
! 		grtaps_print_val("ymax:",graphPrefs.ymax,
! 		                 stdbounds.topLeft.x + stdbounds.extent.x/2,
! 		                 stdbounds.topLeft.y + dy2, align_center);
! 		grtaps_print_val("xmin:",graphPrefs.xmin,
! 		                 stdbounds.topLeft.x,
! 		                 stdbounds.topLeft.y + stdbounds.extent.y/2 + dy3,
! 		                 align_left);
! 		grtaps_print_val("xmax:",graphPrefs.xmax,
! 		                 stdbounds.topLeft.x + stdbounds.extent.x,
! 		                 stdbounds.topLeft.y + stdbounds.extent.y/2 + dy4,
! 		                 align_right);
  	}
  

Index: grprefs.c
===================================================================
RCS file: /cvsroot/easycalc/easycalc/grprefs.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** grprefs.c	10 Nov 2006 04:12:56 -0000	1.26
--- grprefs.c	28 Dec 2006 03:16:17 -0000	1.27
***************
*** 116,120 ****
  		graphPrefs.logy = false;
  		graphPrefs.speed = 1;
! 		for (i=0; i<8; i++){
  			graphPrefs.grEnable[i] = true;
  			if (colorDisplay)
--- 116,123 ----
  		graphPrefs.logy = false;
  		graphPrefs.speed = 1;
! 		for (i=0; i<9; i++){
! 			/* Note: grEnable[8] enables axis labels,
! 			 *       colors[8] is the background color
! 			 */
  			graphPrefs.grEnable[i] = true;
  			if (colorDisplay)
***************
*** 123,127 ****
  				graphPrefs.colors[i] = funcolors[i];
  		}
- 		graphPrefs.grEnable[8] = true;
  		for (i=0; i<6; i++)
  			graphPrefs.grType[i] = 1;
--- 126,129 ----

[Easycalc-commits] easycalc/include defuns.h,1.39,1.40

From: Ton v. O. <tvo...@us...> - 2006-12-28 03:16:25

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

Modified Files:
	defuns.h 
Log Message:
Increase size of colors array in graphPrefs to 9 to eliminate overlap with grEnable since
there really are 9 colors (6 funs + axis + grid + background).
Bumped PREF_GRAPH_VERSION since size of graphPrefs has changed since 1.24.
Draw axes using the correct color (axis color was ignored before).
Thanks to Jorge Gil for catching this.


Index: defuns.h
===================================================================
RCS file: /cvsroot/easycalc/easycalc/include/defuns.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** defuns.h	17 Sep 2006 11:46:06 -0000	1.39
--- defuns.h	28 Dec 2006 03:16:17 -0000	1.40
***************
*** 55,59 ****
  #define PREF_VERSION           44
  #define PREF_RES_VERSION       2
! #define PREF_GRAPH_VERSION     4
  #define PREF_LSTEDIT_VERSION   1
  #define PREF_MTXEDIT_VERSION   1
--- 55,59 ----
  #define PREF_VERSION           44
  #define PREF_RES_VERSION       2
! #define PREF_GRAPH_VERSION     5
  #define PREF_LSTEDIT_VERSION   1
  #define PREF_MTXEDIT_VERSION   1

[Easycalc-commits] easycalc grtable.c,1.23,1.24

From: Ton v. O. <tvo...@us...> - 2006-11-20 03:05:17

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

Modified Files:
	grtable.c 
Log Message:
Correct heading in table mode for polar plots.


Index: grtable.c
===================================================================
RCS file: /cvsroot/easycalc/easycalc/grtable.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** grtable.c	22 Sep 2006 20:04:47 -0000	1.23
--- grtable.c	20 Nov 2006 03:05:07 -0000	1.24
***************
*** 82,101 ****
  	WinSetClip(bounds);
  	
! 	if (row==0) {
  		oldfont = FntSetFont(boldFont);
- 		
  		if (column == 0) {
  			if (graphPrefs.functype == graph_func)
! 			  text = "x";
  			else if (graphPrefs.functype == graph_polar)
! 			  text = "r";
  			else 
! 			  text = "T";
! 			WinDrawChars(text,1,bounds->topLeft.x,bounds->topLeft.y);
! 	    }
  		else {
  			text2 = grsetup_fn_descr(column+firstCol-1);
! 			WinDrawChars(text2,StrLen(text2),bounds->topLeft.x,
! 						 bounds->topLeft.y);
  			
  		}		  
--- 82,100 ----
  	WinSetClip(bounds);
  	
! 	if (row == 0) {
  		oldfont = FntSetFont(boldFont);
  		if (column == 0) {
  			if (graphPrefs.functype == graph_func)
! 				text = "x";
  			else if (graphPrefs.functype == graph_polar)
! 				text = "t";
  			else 
! 				text = "T";
! 			WinDrawChars(text, 1, bounds->topLeft.x, bounds->topLeft.y);
! 		}
  		else {
  			text2 = grsetup_fn_descr(column+firstCol-1);
! 			WinDrawChars(text2, StrLen(text2), bounds->topLeft.x,
! 			             bounds->topLeft.y);
  			
  		}		  
***************
*** 116,121 ****
  		}
  		else /* func and polar */
! 		  stack = graphCurves[column+firstCol-1].stack1;
! 		if (stack){
  			func_get_value(stack,firstVisible+rowStep*(row-1),
  				       &val,NULL);
--- 115,120 ----
  		}
  		else /* func and polar */
! 			stack = graphCurves[column+firstCol-1].stack1;
! 		if (stack) {
  			func_get_value(stack,firstVisible+rowStep*(row-1),
  				       &val,NULL);

[Easycalc-commits] easycalc calc.c, 1.36, 1.37 calc.h, 1.11, 1.12 calcrsc.h, 1.63, 1.64 graph.c, 1.53, 1.54 graph.h, 1.7, 1.8 graph.rcp.in, 1.36, 1.37 grprefs.c, 1.25, 1.26 grprefs.h, 1.12, 1.13 grsetup.c, 1.31, 1.32 grtaps.c, 1.29, 1.30 grtaps.h, 1.6, 1.7

From: Ton v. O. <tvo...@us...> - 2006-11-10 04:13:05

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

Modified Files:
	calc.c calc.h calcrsc.h graph.c graph.h graph.rcp.in grprefs.c 
	grprefs.h grsetup.c grtaps.c grtaps.h 
Log Message:
Added axes labels option.
Simplify grtaps_print_* routines to only use standard coordinates.
Add alignment option to grtaps_print_val.
Various cosmetic whitespace fixes.


Index: calc.c
===================================================================
RCS file: /cvsroot/easycalc/easycalc/calc.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** calc.c	16 Oct 2006 18:58:37 -0000	1.36
--- calc.c	10 Nov 2006 04:12:56 -0000	1.37
***************
*** 88,104 ****
  
  void
! gadget_bounds(FormType *frm, Int16 gadget, RectangleType *bounds)
  {
! 	UInt16 index = FrmGetObjectIndex(frm,gadget);
! 	
! 	FrmGetObjectBounds(frm,index,bounds);
  	
  	// If Sony HR Lib is available, adjust coordinates for high resolution
  #ifdef SONY_SDK
  	if(gHrMode == hrSony) {
! 		bounds->topLeft.x*=2;
! 		bounds->topLeft.y*=2;
! 		bounds->extent.x*=2;
! 		bounds->extent.y*=2;
  	}
  #endif
--- 88,106 ----
  
  void
! gadget_bounds(FormType *frm, Int16 gadget,
!               RectangleType *natbounds, RectangleType *stdbounds)
  {
! 	UInt16 index = FrmGetObjectIndex(frm, gadget);
! 
! 	FrmGetObjectBounds(frm, index, stdbounds);
! 	RctCopyRectangle(stdbounds, natbounds);
  	
  	// If Sony HR Lib is available, adjust coordinates for high resolution
  #ifdef SONY_SDK
  	if(gHrMode == hrSony) {
! 		natbounds->topLeft.x *= 2;
! 		natbounds->topLeft.y *= 2;
! 		natbounds->extent.x *= 2;
! 		natbounds->extent.y *= 2;
  	}
  #endif
***************
*** 107,111 ****
  
  		save = WinSetCoordinateSystem(kCoordinatesNative);
! 		WinScaleRectangle(bounds);
  		WinSetCoordinateSystem(save);
  	}
--- 109,113 ----
  
  		save = WinSetCoordinateSystem(kCoordinatesNative);
! 		WinScaleRectangle(natbounds);
  		WinSetCoordinateSystem(save);
  	}

Index: calc.h
===================================================================
RCS file: /cvsroot/easycalc/easycalc/calc.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** calc.h	1 Oct 2006 22:40:27 -0000	1.11
--- calc.h	10 Nov 2006 04:12:56 -0000	1.12
***************
*** 35,39 ****
  void calc_nil_timeout(Int32 timeout);
  Int16 calc_input_exec(void);
! void gadget_bounds(FormType *frm, Int16 gadget, RectangleType *bounds);
  
  extern Boolean palmOS3;
--- 35,40 ----
  void calc_nil_timeout(Int32 timeout);
  Int16 calc_input_exec(void);
! void gadget_bounds(FormType *frm, Int16 gadget,
!                    RectangleType *natbounds, RectangleType *stdbounds);
  
  extern Boolean palmOS3;

Index: calcrsc.h
===================================================================
RCS file: /cvsroot/easycalc/easycalc/calcrsc.h,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** calcrsc.h	19 Oct 2006 19:36:53 -0000	1.63
--- calcrsc.h	10 Nov 2006 04:12:56 -0000	1.64
***************
*** 389,392 ****
--- 389,393 ----
  #define grBgndLbl	4534
  #define grColorElem	4535
+ #define ckbGrAxesLabels 4536
  
  

Index: graph.rcp.in
===================================================================
RCS file: /cvsroot/easycalc/easycalc/graph.rcp.in,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** graph.rcp.in	19 Oct 2006 19:38:36 -0000	1.36
--- graph.rcp.in	10 Nov 2006 04:12:56 -0000	1.37
***************
*** 34,38 ****
  END
  
! FORM ID grSetupForm AT (2 43 156 115)
  MODAL
  HELPID hlpGrSetup
--- 34,38 ----
  END
  
! FORM ID grSetupForm AT (2 43-11 156 115+11)
  MODAL
  HELPID hlpGrSetup
***************
*** 42,76 ****
     BUTTON " " ID grAxes AT (5 17 6 6) RECTFRAME NONUSABLE
     CHECKBOX "Axes" ID ckbGrAxes AT (12 14 AUTO AUTO)
!    BUTTON " " ID grGrid AT (63 17 6 6) RECTFRAME NONUSABLE
!    CHECKBOX "Grid" ID ckbGrGrid AT (70 14 AUTO AUTO)
!    BUTTON " " ID grBgnd AT (119 17 6 6) RECTFRAME NONUSABLE
!    LABEL "Bgnd" ID grBgndLbl AT (133 14) NONUSABLE
  
!    BUTTON " " ID grColor1 AT (5 32 6 6) RECTFRAME NONUSABLE
!    BUTTON " " ID grColor2 AT (5 43 6 6) RECTFRAME NONUSABLE
!    BUTTON " " ID grColor3 AT (5 54 6 6) RECTFRAME NONUSABLE
!    BUTTON " " ID grColor4 AT (5 65 6 6) RECTFRAME NONUSABLE
!    BUTTON " " ID grColor5 AT (5 76 6 6) RECTFRAME NONUSABLE
!    BUTTON " " ID grColor6 AT (5 87 6 6) RECTFRAME NONUSABLE
     
!    CHECKBOX "" ID ckbGrfun1 AT (12 29 AUTO AUTO)
!    CHECKBOX "" ID ckbGrfun2 AT (12 40 AUTO AUTO) NONUSABLE
!    CHECKBOX "" ID ckbGrfun3 AT (12 51 AUTO AUTO)
!    CHECKBOX "" ID ckbGrfun4 AT (12 62 AUTO AUTO) NONUSABLE
!    CHECKBOX "" ID ckbGrfun5 AT (12 73 AUTO AUTO)
!    CHECKBOX "" ID ckbGrfun6 AT (12 84 AUTO AUTO) NONUSABLE
  
!    TABLE ID grSetupTable AT (25 29 112 67) ROWS 6 COLUMNS 2 COLUMNWIDTHS 16 94
  
!    BUTTON " " ID grType1 AT (139 31 13 7) NOFRAME
!    BUTTON " " ID grType2 AT (139 42 13 7) NOFRAME NONUSABLE
!    BUTTON " " ID grType3 AT (139 53 13 7) NOFRAME
!    BUTTON " " ID grType4 AT (139 64 13 7) NOFRAME NONUSABLE
!    BUTTON " " ID grType5 AT (139 75 13 7) NOFRAME
!    BUTTON " " ID grType6 AT (139 86 13 7) NOFRAME NONUSABLE
  
!    BUTTON "$$DONE" ID grSetupDone AT (5 100 40 12)
!    BUTTON "\001" ID grSetupUp AT (140 98 12 8) FONT 5 NONUSABLE NOFRAME
!    BUTTON "\002" ID grSetupDown   AT (140 106 12 8) FONT 5 NONUSABLE NOFRAME
     
     LIST "" ID grSetupList AT (1 1 62 10) VISIBLEITEMS 10 NONUSABLE DISABLED
--- 42,77 ----
     BUTTON " " ID grAxes AT (5 17 6 6) RECTFRAME NONUSABLE
     CHECKBOX "Axes" ID ckbGrAxes AT (12 14 AUTO AUTO)
!    CHECKBOX "Axes labels" ID ckbGrAxesLabels AT (12 25 AUTO AUTO)
!    BUTTON " " ID grGrid AT (90 17 6 6) RECTFRAME NONUSABLE
!    CHECKBOX "Grid" ID ckbGrGrid AT (97 14 AUTO AUTO)
!    BUTTON " " ID grBgnd AT (90 28 6 6) RECTFRAME NONUSABLE
!    LABEL "Bgnd" ID grBgndLbl AT (104 25) NONUSABLE
  
!    BUTTON " " ID grColor1 AT (5 32+11 6 6) RECTFRAME NONUSABLE
!    BUTTON " " ID grColor2 AT (5 43+11 6 6) RECTFRAME NONUSABLE
!    BUTTON " " ID grColor3 AT (5 54+11 6 6) RECTFRAME NONUSABLE
!    BUTTON " " ID grColor4 AT (5 65+11 6 6) RECTFRAME NONUSABLE
!    BUTTON " " ID grColor5 AT (5 76+11 6 6) RECTFRAME NONUSABLE
!    BUTTON " " ID grColor6 AT (5 87+11 6 6) RECTFRAME NONUSABLE
     
!    CHECKBOX "" ID ckbGrfun1 AT (12 29+11 AUTO AUTO)
!    CHECKBOX "" ID ckbGrfun2 AT (12 40+11 AUTO AUTO) NONUSABLE
!    CHECKBOX "" ID ckbGrfun3 AT (12 51+11 AUTO AUTO)
!    CHECKBOX "" ID ckbGrfun4 AT (12 62+11 AUTO AUTO) NONUSABLE
!    CHECKBOX "" ID ckbGrfun5 AT (12 73+11 AUTO AUTO)
!    CHECKBOX "" ID ckbGrfun6 AT (12 84+11 AUTO AUTO) NONUSABLE
  
!    TABLE ID grSetupTable AT (25 29+11 112 67) ROWS 6 COLUMNS 2 COLUMNWIDTHS 16 94
  
!    BUTTON " " ID grType1 AT (139 31+11 13 7) NOFRAME
!    BUTTON " " ID grType2 AT (139 42+11 13 7) NOFRAME NONUSABLE
!    BUTTON " " ID grType3 AT (139 53+11 13 7) NOFRAME
!    BUTTON " " ID grType4 AT (139 64+11 13 7) NOFRAME NONUSABLE
!    BUTTON " " ID grType5 AT (139 75+11 13 7) NOFRAME
!    BUTTON " " ID grType6 AT (139 86+11 13 7) NOFRAME NONUSABLE
  
!    BUTTON "$$DONE" ID grSetupDone AT (5 100+11 40 12)
!    BUTTON "\001" ID grSetupUp AT (140 98+11 12 8) FONT 5 NONUSABLE NOFRAME
!    BUTTON "\002" ID grSetupDown   AT (140 106+11 12 8) FONT 5 NONUSABLE NOFRAME
     
     LIST "" ID grSetupList AT (1 1 62 10) VISIBLEITEMS 10 NONUSABLE DISABLED

Index: graph.h
===================================================================
RCS file: /cvsroot/easycalc/easycalc/graph.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** graph.h	12 Sep 2006 19:40:55 -0000	1.7
--- graph.h	10 Nov 2006 04:12:56 -0000	1.8
***************
*** 43,46 ****
--- 43,47 ----
  void graph_setcolor(Int16 funcnum) GRAPH;
  void graph_unsetcolor(void) GRAPH;
+ void graph_redrawform(void) GRAPH;
  
  extern Tgraph_curves graphCurves[MAX_GRFUNCS];

Index: grsetup.c
===================================================================
RCS file: /cvsroot/easycalc/easycalc/grsetup.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** grsetup.c	19 Oct 2006 19:40:48 -0000	1.31
--- grsetup.c	10 Nov 2006 04:12:56 -0000	1.32
***************
*** 299,307 ****
  	Int16 height;
  
- 	height = FntLineHeight();
- 	if (handera)
- 		height = height * 3 / 2;
  	table = GetObjectPtr(grSetupTable);
  	rows = TblGetNumberOfRows(table);
  
  	for (i=0;i<rows;i++) {
--- 299,307 ----
  	Int16 height;
  
  	table = GetObjectPtr(grSetupTable);
  	rows = TblGetNumberOfRows(table);
+ 	height = TblGetRowHeight(table, 0);
+ 	if (handera)
+ 		height = height * 3 / 2 + 1;
  
  	for (i=0;i<rows;i++) {
***************
*** 323,326 ****
--- 323,327 ----
  	CtlSetValue(GetObjectPtr(ckbGrAxes), graphPrefs.grEnable[6]);
  	CtlSetValue(GetObjectPtr(ckbGrGrid), graphPrefs.grEnable[7]);
+ 	CtlSetValue(GetObjectPtr(ckbGrAxesLabels), graphPrefs.grEnable[8]);
  
  	/* Setup the up/down pointers, grType and grColor buttons*/
***************
*** 695,701 ****
  			graphPrefs.grEnable[6] = CtlGetValue(GetObjectPtr(ckbGrAxes));
  			graphPrefs.grEnable[7] = CtlGetValue(GetObjectPtr(ckbGrGrid));
  			grSetupOpen = false;
  			FrmReturnToForm(0);
! 			FrmUpdateForm(frmGraph, frmUpdateVars);
  			handled = true;
  			break;
--- 696,703 ----
  			graphPrefs.grEnable[6] = CtlGetValue(GetObjectPtr(ckbGrAxes));
  			graphPrefs.grEnable[7] = CtlGetValue(GetObjectPtr(ckbGrGrid));
+ 			graphPrefs.grEnable[8] = CtlGetValue(GetObjectPtr(ckbGrAxesLabels));
  			grSetupOpen = false;
  			FrmReturnToForm(0);
! 			FrmUpdateForm(frmGraph, frmRedrawUpdateCode);
  			handled = true;
  			break;
***************
*** 778,781 ****
--- 780,784 ----
  				graphPrefs.colors[row] = col;
  			}
+ 			graph_redrawform();
  			FrmDrawForm(frm);
  			draw_grType(frm);

Index: grprefs.h
===================================================================
RCS file: /cvsroot/easycalc/easycalc/grprefs.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** grprefs.h	19 Oct 2006 19:40:16 -0000	1.12
--- grprefs.h	10 Nov 2006 04:12:56 -0000	1.13
***************
*** 50,54 ****
  	Boolean logx,logy;
  	Int16 speed;
! 	IndexedColorType colors[9];
  	Boolean grEnable[9];
  	Int8 grType[6];
--- 50,54 ----
  	Boolean logx,logy;
  	Int16 speed;
! 	IndexedColorType colors[8];
  	Boolean grEnable[9];
  	Int8 grType[6];

Index: grtaps.h
===================================================================
RCS file: /cvsroot/easycalc/easycalc/grtaps.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** grtaps.h	12 Sep 2006 19:40:55 -0000	1.6
--- grtaps.h	10 Nov 2006 04:12:56 -0000	1.7
***************
*** 33,38 ****
--- 33,46 ----
  }TtrackAction;
  
+ typedef enum {
+ 	align_left,
+ 	align_center,
+ 	align_right
+ } Ttxtalign;
+ 
  Boolean grtaps_tap(Int16 x,Int16 y) GRAPH;
  Boolean grtaps_track_but(void) GRAPH;
+ void grtaps_print_val(char *name, double value,
+                       Coord x, Coord y, Ttxtalign align) GRAPH;
  void grtaps_track_manual(double value,TtrackAction action) GRAPH;
  void grtaps_track_pause(void) GRAPH;

Index: graph.c
===================================================================
RCS file: /cvsroot/easycalc/easycalc/graph.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** graph.c	19 Oct 2006 19:37:32 -0000	1.53
--- graph.c	10 Nov 2006 04:12:56 -0000	1.54
***************
*** 193,197 ****
  	double res;
  	res =graphPrefs.xmin+(double)(x-ScrPrefs.xmin)/ScrPrefs.xtrans;
! 	
  	if (graphPrefs.logx) {
  		res -= graphPrefs.xmin;
--- 193,197 ----
  	double res;
  	res =graphPrefs.xmin+(double)(x-ScrPrefs.xmin)/ScrPrefs.xtrans;
! 
  	if (graphPrefs.logx) {
  		res -= graphPrefs.xmin;
***************
*** 208,212 ****
  	double res;
  	res = graphPrefs.ymin+(double)(ScrPrefs.ymin-y)/ScrPrefs.ytrans;
! 	
  	if (graphPrefs.logy) {
  		res -= graphPrefs.ymin;
--- 208,212 ----
  	double res;
  	res = graphPrefs.ymin+(double)(ScrPrefs.ymin-y)/ScrPrefs.ytrans;
! 
  	if (graphPrefs.logy) {
  		res -= graphPrefs.ymin;
***************
*** 238,246 ****
  {
  	double sidea,sideb,parta;
! 	
  	sidea = y2-y1;
  	sideb = x2-x1;
  	parta = x2 - x3;
! 	
  	return y2-(sidea*parta)/sideb;
  }
--- 238,246 ----
  {
  	double sidea,sideb,parta;
! 
  	sidea = y2-y1;
  	sideb = x2-x1;
  	parta = x2 - x3;
! 
  	return y2-(sidea*parta)/sideb;
  }
***************
*** 282,286 ****
  		return;
  	} 
! 	
  	tmp = graph_isec_y(onx,ony,offx,offy,graphPrefs.xmin);
  	if (offx<graphPrefs.xmin && tmp>=graphPrefs.ymin && tmp<=graphPrefs.ymax) {
--- 282,286 ----
  		return;
  	} 
! 
  	tmp = graph_isec_y(onx,ony,offx,offy,graphPrefs.xmin);
  	if (offx<graphPrefs.xmin && tmp>=graphPrefs.ymin && tmp<=graphPrefs.ymax) {
***************
*** 432,436 ****
  							 
  	graph_setcolor(-2);
! 	
  	tmpy = graph_yscr2gr(bounds->topLeft.y + bounds->extent.y);
  	ystart = ceil(tmpy/yscale)*yscale;
--- 432,436 ----
  							 
  	graph_setcolor(-2);
! 
  	tmpy = graph_yscr2gr(bounds->topLeft.y + bounds->extent.y);
  	ystart = ceil(tmpy/yscale)*yscale;
***************
*** 444,448 ****
  		}
  	}
! 	
  	graph_unsetcolor();
  }
--- 444,448 ----
  		}
  	}
! 
  	graph_unsetcolor();
  }
***************
*** 462,466 ****
  
  	/* Check, if the bounds are correct */
! 	gadget_bounds(frm, graphId, &natbounds);
  #ifdef SUPPORT_DIA
  	/* Adjust in case of window resize */
--- 462,466 ----
  
  	/* Check, if the bounds are correct */
! 	gadget_bounds(frm, graphId, &natbounds, &stdbounds);
  #ifdef SUPPORT_DIA
  	/* Adjust in case of window resize */
***************
*** 487,512 ****
  	graph_setcolor(-1);
  	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();
- 
  	/* Only (re)draw grid when whole graph gadget is inside the
  	   clip rectangle */
  	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)
--- 487,530 ----
  	graph_setcolor(-1);
  	clie_eraserectangle(&natbounds,0);
+ 	graph_unsetcolor();
  
! 	if (graphPrefs.grEnable[6]) { /* axes drawing enabled */
! 		/* y axis */
! 		x = graph_xgr2scr(0.0);
! 		if (x>ScrPrefs.xmin && x<ScrPrefs.xmax)
! 			clie_drawline(x,ScrPrefs.ymax,x,ScrPrefs.ymin);
! 		/* x axis */
! 		y = graph_ygr2scr(0.0);
! 		if (y>ScrPrefs.ymax && y<ScrPrefs.ymin)
! 			clie_drawline(ScrPrefs.xmin,y,ScrPrefs.xmax,y);
! 		/* draw axes labels */
! 		if (graphPrefs.grEnable[8]) { /* axes labels enabled */
! 			Coord dy1 = HanderaCoord(-11);
! 			Coord dy2 = HanderaCoord(-1);
! 			Coord dy3 = HanderaCoord(-10);
! 			Coord dy4 = HanderaCoord(-1);
  
! 			grtaps_print_val("ymin:",graphPrefs.ymin,
! 			                 stdbounds.topLeft.x + stdbounds.extent.x/2,
! 			                 stdbounds.topLeft.y + stdbounds.extent.y + dy1,
! 			                 align_center);
! 			grtaps_print_val("ymax:",graphPrefs.ymax,
! 			                 stdbounds.topLeft.x + stdbounds.extent.x/2,
! 			                 stdbounds.topLeft.y + dy2, align_center);
! 			grtaps_print_val("xmin:",graphPrefs.xmin,
! 			                 stdbounds.topLeft.x,
! 			                 stdbounds.topLeft.y + stdbounds.extent.y/2 + dy3,
! 			                 align_left);
! 			grtaps_print_val("xmax:",graphPrefs.xmax,
! 			                 stdbounds.topLeft.x + stdbounds.extent.x,
! 			                 stdbounds.topLeft.y + stdbounds.extent.y/2 + dy4,
! 			                 align_right);
! 		}
  	}
  
  	/* Only (re)draw grid when whole graph gadget is inside the
  	   clip rectangle */
  	WinGetClip(&clip);
! 	if (graphPrefs.grEnable[7] /* grid drawing enabled */ &&
  	    clip.topLeft.y <= stdbounds.topLeft.y &&
  	    clip.topLeft.y + clip.extent.y >= stdbounds.topLeft.y + stdbounds.extent.y)
***************
*** 1100,1101 ****
--- 1118,1127 ----
  	return handled;
  }
+  
+ void graph_redrawform(void)
+ {
+ 	FormType *frm = FrmGetFormPtr(frmGraph);
+ 
+ 	FrmDrawForm(frm);
+ 	graph_init_screen(frm, graphGadget);
+ }

Index: grtaps.c
===================================================================
RCS file: /cvsroot/easycalc/easycalc/grtaps.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** grtaps.c	11 Oct 2006 17:09:11 -0000	1.29
--- grtaps.c	10 Nov 2006 04:12:56 -0000	1.30
***************
*** 46,54 ****
  #include "funcs.h"
  
! static Int16 trackSelected=0;
! static double lastParam=0.0;
! static Coord crossX=-1,crossY=-1;
  
! static const TdispPrefs grNumPrefs = { 5,true,disp_normal,disp_decimal,false,false};
  
  /***********************************************************************
--- 46,85 ----
  #include "funcs.h"
  
! static Int16 trackSelected = 0;
! static double lastParam = 0.0;
! static Coord crossX = -1, crossY = -1;
! static double oldr = NaN;
! static double oldangle = NaN;
! static double oldparam = NaN;
! static double oldrealx = NaN;
! static double oldrealy = NaN;
! static const TdispPrefs grNumPrefs = { 5, true, disp_normal, disp_decimal, false, false};
  
! /***********************************************************************
!  *
!  * FUNCTION:     EvtGetPenNat
!  *
!  * DESCRIPTION:  As EvtGetPen, but returns native screen coordinates.
!  *
!  * PARAMETERS:   Same as EvtGetPen().
!  *
!  * RETURN:       Nothing.
!  *
!  ***********************************************************************/
! static void
! EvtGetPenNat(Coord *x, Coord *y, Boolean *penDown)
! {
! 	EvtGetPen(x, y, penDown);
! 	if (gHrMode == hrPalm) {
! 		UInt16 save = WinSetCoordinateSystem(kCoordinatesNative);
! 		*x = WinScaleCoord(*x, true);
! 		*y = WinScaleCoord(*y, true);
! 		WinSetCoordinateSystem(save);
! 	}
! 	else {
! 		*x *= gSonyFactor;
! 		*y *= gSonyFactor;
! 	}
! }
  
  /***********************************************************************
***************
*** 147,151 ****
  	RectangleType orgbounds,rs;
  	double xmin,ymin;
- 	UInt16 save = 0;
  	
  	orgwindow = clie_createoffscreenwindow(bounds->extent.x,bounds->extent.y,
--- 178,181 ----
***************
*** 162,177 ****
  	
  	graph_setcolor(-1);
- 	if (gHrMode == hrPalm)
- 		save = WinSetCoordinateSystem(kCoordinatesNative);
  	do {
! 		EvtGetPen(&x,&y,&penDown);
! 		if (gHrMode == hrPalm) {
! 			x = WinScaleCoord(x, true);
! 			y = WinScaleCoord(y, true);
! 		}
! 		else {
! 			x *= gSonyFactor;
! 			y *= gSonyFactor;
! 		}
  		if ((oldx!=x || oldy!=y) && RctPtInRectangle(x,y,bounds)) {
  			dx = (orgwindow ? x-begx : x-oldx);
--- 192,197 ----
  	
  	graph_setcolor(-1);
  	do {
! 		EvtGetPenNat(&x, &y, &penDown);
  		if ((oldx!=x || oldy!=y) && RctPtInRectangle(x,y,bounds)) {
  			dx = (orgwindow ? x-begx : x-oldx);
***************
*** 184,189 ****
  		}
  	} while(penDown);
- 	if (gHrMode == hrPalm)
- 		WinSetCoordinateSystem(save);
  	graph_unsetcolor();
  
--- 204,207 ----
***************
*** 245,259 ****
  	
  	do {
! 		EvtGetPen(&x, &y, &penDown);
! 		if (gHrMode == hrPalm) {
! 			UInt16 save = WinSetCoordinateSystem(kCoordinatesNative);
! 			x = WinScaleCoord(x, true);
! 			y = WinScaleCoord(y, true);
! 			WinSetCoordinateSystem(save);
! 		}
! 		else {
! 			x *= gSonyFactor;
! 			y *= gSonyFactor;
! 		}
  		if ((oldx != x || oldy != y) && RctPtInRectangle(x, y, bounds)) {
  			grtaps_rectangle(begx, begy, x, y);
--- 263,267 ----
  	
  	do {
! 		EvtGetPenNat(&x, &y, &penDown);
  		if ((oldx != x || oldy != y) && RctPtInRectangle(x, y, bounds)) {
  			grtaps_rectangle(begx, begy, x, y);
***************
*** 262,278 ****
  		}
  	} while(penDown);
! 	grtaps_rectangle(begx, begy, oldx, oldy); /* Remove the rectangle from screen */
! 	if (!RctPtInRectangle(x,y,bounds)) /* User wanted to cancel the zoom */
! 	  return false;
  	
  	if (oldx==begx || oldy==begy)
! 	  return false;
  	
! 	if (begx>oldx) {
! 		tmp=begx;begx=oldx;oldx=tmp;
  	}
  	/* The Y axis is inversed on the screen */
! 	if (begy<oldy) {
! 		tmp=begy;begy=oldy;oldy=tmp;
  	}       	
  	/* begx - Left corner of the box, oldx - right */
--- 270,290 ----
  		}
  	} while(penDown);
! 	/* Remove the rectangle from screen */
! 	grtaps_rectangle(begx, begy, oldx, oldy);
! 	if (!RctPtInRectangle(x,y,bounds)) {
! 		/* User wanted to cancel the zoom */
! 		return false;
! 	}
  	
  	if (oldx==begx || oldy==begy)
! 		return false;
  	
! 	if (begx > oldx) {
! 		tmp = begx; begx = oldx; oldx = tmp;
  	}
+ 
  	/* The Y axis is inversed on the screen */
! 	if (begy < oldy) {
! 		tmp = begy; begy = oldy; oldy = tmp;
  	}       	
  	/* begx - Left corner of the box, oldx - right */
***************
*** 281,285 ****
  	graphPrefs.xmax=graph_xscr2gr(oldx);
  	graphPrefs.xmin=graph_xscr2gr(begx);
- 
  	graphPrefs.ymax=graph_yscr2gr(oldy);
  	graphPrefs.ymin=graph_yscr2gr(begy);
--- 293,296 ----
***************
*** 348,358 ****
  grtaps_cross(Int16 x,Int16 y,RectangleType *bounds)
  {
! 	if (x!=-1) 
! 	  clie_invertline(x,bounds->topLeft.y,x,
! 					bounds->topLeft.y+bounds->extent.y-1);
! 	if (y!=-1) 
! 	  clie_invertline(bounds->topLeft.x,y,
! 					bounds->topLeft.x+bounds->extent.x-1,
! 					y);	
  }
  
--- 359,368 ----
  grtaps_cross(Int16 x,Int16 y,RectangleType *bounds)
  {
! 	if (x != -1) 
! 		clie_invertline(x, bounds->topLeft.y,
! 		                x, bounds->topLeft.y + bounds->extent.y - 1);
! 	if (y != -1) 
! 		clie_invertline(bounds->topLeft.x, y,
! 		                bounds->topLeft.x + bounds->extent.x - 1, y);	
  }
  
***************
*** 367,410 ****
   *               value - number to be drawn
   *               x,y - coordinates
   *
   * RETURN:       Nothing
   *      
   ***********************************************************************/
! static void
! grtaps_print_val(char *name, double value, Coord x, Coord y) GRAPH;
! static void
! grtaps_print_val(char *name, double value, Coord x, Coord y)
  {
  	char text[MAX_FP_NUMBER+10];
- 	RectangleType bounds;
  	TdispPrefs oldprefs;
  
! 	if (gHrMode == hrPalm) {
! 		UInt16 save = WinSetCoordinateSystem(kCoordinatesNative);
! 		x = WinUnscaleCoord(x, true);
! 		y = WinUnscaleCoord(y, true);
! 		WinSetCoordinateSystem(save);
! 	}
! 	else {
! 		x /= gSonyFactor;
! 		y /= gSonyFactor;
! 	}
  
  	oldprefs = fp_set_prefs(grNumPrefs);
  	
  	StrCopy(text,name);
! 	fp_print_double(text+StrLen(text),value);
  
  	fp_set_prefs(oldprefs);
- 	
- 	bounds.topLeft.x = x;
- 	bounds.topLeft.y = y;
- 	bounds.extent.x = HanderaCoord(68);
- 	bounds.extent.y = HanderaCoord(12);
- 	WinEraseRectangle(&bounds, 0);
- #ifdef SUPPORT_DIA
- 	FntSetFont(HanderaAdjustFont(FntGetFont()));
- #endif
- 	WinDrawChars(text, StrLen(text), x, y);
  }
  
--- 377,412 ----
   *               value - number to be drawn
   *               x,y - coordinates
+  *               align - alignment w.r.t. coordinates
   *
   * RETURN:       Nothing
   *      
   ***********************************************************************/
! void
! grtaps_print_val(char *name, double value, Coord x, Coord y, Ttxtalign align)
  {
  	char text[MAX_FP_NUMBER+10];
  	TdispPrefs oldprefs;
+ 	Char *numtxt;
  
! #ifdef SUPPORT_DIA
! 	FntSetFont(HanderaAdjustFont(FntGetFont()));
! #endif
  
  	oldprefs = fp_set_prefs(grNumPrefs);
  	
  	StrCopy(text,name);
! 	numtxt = text + StrLen(text);
! 	if (finite(value)) {
! 		fp_print_double(numtxt, value);
! 		if (align == align_center) {
! 			x -= FntCharsWidth(text, StrLen(text)) / 2;
! 		}
! 		else if (align == align_right) {
! 			x -= FntCharsWidth(text, StrLen(text));
! 		}
! 		WinInvertChars(text, StrLen(text), x, y);
! 	}
  
  	fp_set_prefs(oldprefs);
  }
  
***************
*** 427,451 ****
  grtaps_print_pol(double r, double angle,RectangleType *bounds)
  {
! 	UInt16 save;
! 	Coord dx1 = HanderaCoord(1), dx2 = HanderaCoord(2);
! 	Coord dy = HanderaCoord(12);
  
! 	if (gHrMode == hrPalm) {
! 		save = WinSetCoordinateSystem(kCoordinatesNative);
! 		dx1 = WinScaleCoord(dx1, true);
! 		dx2 = WinScaleCoord(dx2, true);
! 		dy = WinScaleCoord(dy, true);
! 		WinSetCoordinateSystem(save);
! 	}
! 	else {
! 		dx1 *= gSonyFactor;
! 		dx2 *= gSonyFactor;
! 		dy *= gSonyFactor;
! 	}
! 	grtaps_print_val("r:",r,bounds->topLeft.x+dx1,
! 					 bounds->topLeft.y+bounds->extent.y-dy);
  	
! 	grtaps_print_val("fi:",angle,bounds->topLeft.x+bounds->extent.x/2+dx2,
! 					 bounds->topLeft.y+bounds->extent.y-dy);
  }
  
--- 429,442 ----
  grtaps_print_pol(double r, double angle,RectangleType *bounds)
  {
! 	Coord dx1 = HanderaCoord(1);
! 	Coord dy = HanderaCoord(11);
  
! 	if (graphPrefs.grEnable[8])
! 		dy += HanderaCoord(7);
! 	grtaps_print_val("r:", r, bounds->topLeft.x + dx1,
! 	                 bounds->topLeft.y + bounds->extent.y - dy, align_left);
  	
! 	grtaps_print_val("fi:", angle, bounds->topLeft.x + bounds->extent.x,
! 	                 bounds->topLeft.y + bounds->extent.y - dy, align_right);
  }
  
***************
*** 455,473 ****
  grtaps_print_param(double t,RectangleType *bounds)
  {
!     UInt16 save;
!     Coord dx1 = HanderaCoord(1), dy = HanderaCoord(12);
  
! 	if (gHrMode == hrPalm) {
! 		save = WinSetCoordinateSystem(kCoordinatesNative);
! 		dx1 = WinScaleCoord(dx1, true);
! 		dy = WinScaleCoord(dy, true);
! 		WinSetCoordinateSystem(save);
! 	}
! 	else {
! 		dx1 *= gSonyFactor;
! 		dy *= gSonyFactor;
! 	}
! 	grtaps_print_val("T:",t,bounds->topLeft.x+dx1,
! 					 bounds->topLeft.y+bounds->extent.y-dy);
  }
  
--- 446,455 ----
  grtaps_print_param(double t,RectangleType *bounds)
  {
! 	Coord dx1 = HanderaCoord(1), dy = HanderaCoord(11);
  
! 	if (graphPrefs.grEnable[8])
! 		dy += HanderaCoord(7);
! 	grtaps_print_val("T:", t, bounds->topLeft.x + dx1,
! 	                 bounds->topLeft.y + bounds->extent.y - dy, align_left);
  }
  
***************
*** 477,497 ****
  grtaps_print_coords(double realx, double realy,RectangleType *bounds)
  {
!     UInt16 save;
!     Coord dx1 = HanderaCoord(1), dx2 = HanderaCoord(2);
  
! 	if (gHrMode == hrPalm) {
! 		save = WinSetCoordinateSystem(kCoordinatesNative);
! 		dx1 = WinScaleCoord(dx1, true);
! 		dx2 = WinScaleCoord(dx2, true);
! 		WinSetCoordinateSystem(save);
! 	}
! 	else {
! 		dx1 *= gSonyFactor;
! 		dx2 *= gSonyFactor;
! 	}
! 	grtaps_print_val("x:",realx,bounds->topLeft.x+dx1,bounds->topLeft.y);
  
! 	grtaps_print_val("y:",realy,bounds->topLeft.x+bounds->extent.x/2+dx2,
! 					 bounds->topLeft.y);
  }
  
--- 459,473 ----
  grtaps_print_coords(double realx, double realy,RectangleType *bounds)
  {
! 	Coord dx1 = HanderaCoord(1);
! 	Coord dy7 = HanderaCoord(7);
! 	Coord y;
  
! 	y = bounds->topLeft.y;
! 	if (graphPrefs.grEnable[8])
! 		y += dy7;
! 	grtaps_print_val("x:", realx, bounds->topLeft.x + dx1, y, align_left);
  
! 	grtaps_print_val("y:", realy, bounds->topLeft.x + bounds->extent.x,
! 	                 y, align_right);
  }
  
***************
*** 517,524 ****
   ***********************************************************************/
  void
! grtaps_track_manual(double value,TtrackAction action)
  {
  	double realx, realy, r;
! 	RectangleType bounds;
  
  	if (graphPrefs.functype == graph_polar) {
--- 493,501 ----
   ***********************************************************************/
  void
! grtaps_track_manual(double value, TtrackAction action)
  {
  	double realx, realy, r;
! 	RectangleType natbounds;
! 	RectangleType stdbounds;
  
  	if (graphPrefs.functype == graph_polar) {
***************
*** 526,536 ****
  	}
  
! 	if (action==track_reset) {
  		lastParam = value;
  		crossX = crossY = -1;
  		return;
  	}
  	else {
! 		gadget_bounds(FrmGetActiveForm(), graphGadget, &bounds);
  		
  		if (action == track_set)
--- 503,514 ----
  	}
  
! 	if (action == track_reset) {
  		lastParam = value;
  		crossX = crossY = -1;
+ 		oldr = oldangle = oldparam = oldrealx = oldrealy = NaN;
  		return;
  	}
  	else {
! 		gadget_bounds(FrmGetActiveForm(), graphGadget, &natbounds, &stdbounds);
  		
  		if (action == track_set)
***************
*** 539,563 ****
  			lastParam += value;
  
! 		if (action != track_redraw)
! 			grtaps_cross(crossX, crossY, &bounds);
  
  		graph_get_vals(trackSelected, lastParam, &realx, &realy);
  		crossX = finite(realx) ? graph_xgr2scr(realx) : -1;
  		crossY = finite(realy) ? graph_ygr2scr(realy) : -1;
! 		if (crossX < bounds.topLeft.x 
! 		    || crossX > bounds.topLeft.x + bounds.extent.x)
  			crossX = -1;
! 		if (crossY < bounds.topLeft.y 
! 		    || crossY > bounds.topLeft.y + bounds.extent.y)
  			crossY = -1;
! 		grtaps_cross(crossX, crossY, &bounds);
! 		grtaps_print_coords(realx, realy, &bounds);
! 		if (graphPrefs.functype == graph_param)
! 			grtaps_print_param(lastParam, &bounds);
  		else if (graphPrefs.functype == graph_polar) {
  			// func_get_value(graphCurves[trackSelected].stack1,
  			//                lastParam,&r,NULL);
  			r = sqrt(realx * realx + realy * realy);
! 			grtaps_print_pol(r, math_rad_to_user(lastParam), &bounds);
  		}
  	}
--- 517,553 ----
  			lastParam += value;
  
! 		if (action != track_redraw) {
! 			/* Erase previously drawn cross + text */
! 			grtaps_cross(crossX, crossY, &natbounds);
! 			grtaps_print_coords(oldrealx, oldrealy, &stdbounds);
! 			if (graphPrefs.functype == graph_param)
! 				grtaps_print_param(oldparam, &stdbounds);
! 			else if (graphPrefs.functype == graph_polar)
! 				grtaps_print_pol(oldr, oldangle, &stdbounds);
! 		}
  
  		graph_get_vals(trackSelected, lastParam, &realx, &realy);
  		crossX = finite(realx) ? graph_xgr2scr(realx) : -1;
  		crossY = finite(realy) ? graph_ygr2scr(realy) : -1;
! 		if (crossX < natbounds.topLeft.x 
! 		    || crossX > natbounds.topLeft.x + natbounds.extent.x)
  			crossX = -1;
! 		if (crossY < natbounds.topLeft.y 
! 		    || crossY > natbounds.topLeft.y + natbounds.extent.y)
  			crossY = -1;
! 		grtaps_cross(crossX, crossY, &natbounds);
! 		grtaps_print_coords(realx, realy, &stdbounds);
! 		oldrealx = realx; oldrealy = realy;
! 		if (graphPrefs.functype == graph_param) {
! 			grtaps_print_param(lastParam, &stdbounds);
! 			oldparam = lastParam;
! 		}
  		else if (graphPrefs.functype == graph_polar) {
  			// func_get_value(graphCurves[trackSelected].stack1,
  			//                lastParam,&r,NULL);
  			r = sqrt(realx * realx + realy * realy);
! 			grtaps_print_pol(r, math_rad_to_user(lastParam), &stdbounds);
! 			oldr = r;
! 			oldangle = math_rad_to_user(lastParam);
  		}
  	}
***************
*** 578,590 ****
   ***********************************************************************/
  static Boolean
! grtaps_track_pol(Coord x,Coord y,RectangleType *bounds) GRAPH;
  static Boolean
! grtaps_track_pol(Coord x,Coord y,RectangleType *bounds)
  {
! 	double realx,realy;
  	double r;	
  	double angle_rad; /* angle in radians */
  	double angle_usr; /* angle in user units: rad/deg/grad */
! 	Coord oldx,oldy,dx,dy;
  	CodeStack *stack;
  	Boolean penDown;	
--- 568,582 ----
   ***********************************************************************/
  static Boolean
! grtaps_track_pol(Coord x, Coord y,
!                  RectangleType *natbounds, RectangleType *stdbounds) GRAPH;
  static Boolean
! grtaps_track_pol(Coord x, Coord y,
!                  RectangleType *natbounds, RectangleType *stdbounds)
  {
! 	double realx, realy;
  	double r;	
  	double angle_rad; /* angle in radians */
  	double angle_usr; /* angle in user units: rad/deg/grad */
! 	Coord oldx, oldy, dx, dy;
  	CodeStack *stack;
  	Boolean penDown;	
***************
*** 597,632 ****
  	realx = realy = r = angle_rad = angle_usr = NaN;
  	do {
! 		EvtGetPen(&x,&y,&penDown);
!                 if (gHrMode == hrPalm) {
!                         UInt16 save = WinSetCoordinateSystem(kCoordinatesNative);
!                         x = WinScaleCoord(x, true);
!                         y = WinScaleCoord(y, true);
!                         WinSetCoordinateSystem(save);
!                 }
!                 else {
!                         x *= gSonyFactor;
!                         y *= gSonyFactor;
!                 }
! 		if ((oldx!=x || oldy!=y) && RctPtInRectangle(x,y,bounds)) {
  			realx = graph_xscr2gr(x);
  			realy = graph_yscr2gr(y);
  			angle_rad = angle_usr = NaN;
! 			r = hypot(realx,realy);
! 			if (r!=0.0) {
! 				if (realx>=0.0 && realy>=0.0)
! 					angle_rad = asin(realy/r);
! 				else if (realx<=0.0)
! 					angle_rad = M_PIl - asin(realy/r);
  				else
! 					angle_rad = 2*M_PIl + asin(realy/r);
  				angle_usr = math_rad_to_user(angle_rad);
  
! 				func_get_value(stack,angle_usr,&r,NULL);
! 				
! 				realx = r*cos(angle_rad);
! 				realy = r*sin(angle_rad);
  				dx = graph_xgr2scr(realx);
  				dy = graph_ygr2scr(realy);
! 				if (!finite(angle_rad) || !RctPtInRectangle(dx,dy,bounds)) {
  					dy = -1;				
  					dx = -1;
--- 589,614 ----
  	realx = realy = r = angle_rad = angle_usr = NaN;
  	do {
! 		EvtGetPenNat(&x, &y, &penDown);
! 		if ((oldx != x || oldy != y) && RctPtInRectangle(x, y, natbounds)) {
  			realx = graph_xscr2gr(x);
  			realy = graph_yscr2gr(y);
  			angle_rad = angle_usr = NaN;
! 			r = hypot(realx, realy);
! 			if (r != 0.0) {
! 				if (realx >= 0.0 && realy >= 0.0)
! 					angle_rad = asin(realy / r);
! 				else if (realx <= 0.0)
! 					angle_rad = M_PIl - asin(realy / r);
  				else
! 					angle_rad = 2 * M_PIl + asin(realy / r);
  				angle_usr = math_rad_to_user(angle_rad);
  
! 				func_get_value(stack, angle_usr, &r, NULL);
! 
! 				realx = r * cos(angle_rad);
! 				realy = r * sin(angle_rad);
  				dx = graph_xgr2scr(realx);
  				dy = graph_ygr2scr(realy);
! 				if (!finite(angle_rad) || !RctPtInRectangle(dx, dy, natbounds)) {
  					dy = -1;				
  					dx = -1;
***************
*** 637,650 ****
  				realx = realy = NaN;
  			}
! 			grtaps_cross(dx,dy,bounds);
! 			grtaps_cross(crossX,crossY,bounds);
! 			grtaps_print_coords(realx,realy,bounds);
! 			grtaps_print_pol(r,angle_usr,bounds);
! 			oldx = x;oldy = y;
! 			crossX = dx;crossY=dy;
  		}		
  	} while(penDown);	   	
  	
! 	if (RctPtInRectangle(x, y, bounds)) {
  		lastParam = angle_rad;
  		return true;
--- 619,636 ----
  				realx = realy = NaN;
  			}
! 			grtaps_cross(dx, dy, natbounds);
! 			grtaps_cross(crossX, crossY, natbounds);
! 			grtaps_print_coords(oldrealx, oldrealy, stdbounds);
! 			grtaps_print_coords(realx, realy, stdbounds);
! 			grtaps_print_pol(oldr, oldangle, stdbounds);
! 			grtaps_print_pol(r, angle_usr, stdbounds);
! 			oldx = x; oldy = y;
! 			crossX = dx; crossY = dy;
! 			oldrealx = realx; oldrealy = realy;
! 			oldr = r; oldangle = angle_usr;
  		}		
  	} while(penDown);	   	
  	
! 	if (RctPtInRectangle(x, y, natbounds)) {
  		lastParam = angle_rad;
  		return true;
***************
*** 668,678 ****
   ***********************************************************************/
  static Boolean
! grtaps_track_param(Coord x,Coord y,RectangleType *bounds) GRAPH;
  static Boolean
! grtaps_track_param(Coord x,Coord y,RectangleType *bounds)
  {
! 	double realx,realy;
  	double param;
! 	Coord oldx,oldy,dx,dy;
  	CodeStack *stack1, *stack2;
  	double x2param;
--- 654,666 ----
   ***********************************************************************/
  static Boolean
! grtaps_track_param(Coord x, Coord y,
!                    RectangleType *natbounds, RectangleType *stdbounds) GRAPH;
  static Boolean
! grtaps_track_param(Coord x, Coord y,
!                    RectangleType *natbounds, RectangleType *stdbounds)
  {
! 	double realx, realy;
  	double param;
! 	Coord oldx, oldy, dx, dy;
  	CodeStack *stack1, *stack2;
  	double x2param;
***************
*** 686,704 ****
  	oldx = oldy = -1;
  	realx = realy = param = NaN;
! 	x2param = (graphPrefs.tmax - graphPrefs.tmin) / (double)bounds->extent.x;
  	do {
! 		EvtGetPen(&x, &y, &penDown);
! 		if (gHrMode == hrPalm) {
! 			UInt16 save = WinSetCoordinateSystem(kCoordinatesNative);
! 			x = WinScaleCoord(x, true);
! 			y = WinScaleCoord(y, true);
! 			WinSetCoordinateSystem(save);
! 		}
! 		else {
! 			x *= gSonyFactor;
! 			y *= gSonyFactor;
! 		}
! 		if (oldx != x && RctPtInRectangle(x, y, bounds)) {
! 			param = (double)(x - bounds->topLeft.x) * x2param;
  			param = graphPrefs.tmin
  			        + round(param / graphPrefs.tstep) * graphPrefs.tstep;
--- 674,682 ----
  	oldx = oldy = -1;
  	realx = realy = param = NaN;
! 	x2param = (graphPrefs.tmax - graphPrefs.tmin) / (double)natbounds->extent.x;
  	do {
! 		EvtGetPenNat(&x, &y, &penDown);
! 		if (oldx != x && RctPtInRectangle(x, y, natbounds)) {
! 			param = (double)(x - natbounds->topLeft.x) * x2param;
  			param = graphPrefs.tmin
  			        + round(param / graphPrefs.tstep) * graphPrefs.tstep;
***************
*** 708,716 ****
  				dx = graph_xgr2scr(realx);
  				dy = graph_ygr2scr(realy);
! 				if (dx < bounds->topLeft.x ||
! 					dx > bounds->topLeft.x + bounds->extent.x)
  					dx = -1;
! 				if (dy < bounds->topLeft.y ||
! 					dy > bounds->topLeft.y + bounds->extent.y)
  					dy = -1;
  			}
--- 686,694 ----
  				dx = graph_xgr2scr(realx);
  				dy = graph_ygr2scr(realy);
! 				if (dx < natbounds->topLeft.x ||
! 					dx > natbounds->topLeft.x + natbounds->extent.x)
  					dx = -1;
! 				if (dy < natbounds->topLeft.y ||
! 					dy > natbounds->topLeft.y + natbounds->extent.y)
  					dy = -1;
  			}
***************
*** 719,732 ****
  				realx = realy = NaN;
  			}
! 			grtaps_cross(dx, dy, bounds);
! 			grtaps_cross(crossX, crossY, bounds);
! 			grtaps_print_coords(realx, realy, bounds);
! 			grtaps_print_param(param, bounds);
  			oldx = x; oldy = y;
  			crossX = dx; crossY = dy;
  		}
  	} while (penDown);
  
! 	if (RctPtInRectangle(x, y, bounds)) {
  		lastParam = param;
  		return true;
--- 697,714 ----
  				realx = realy = NaN;
  			}
! 			grtaps_cross(dx, dy, natbounds);
! 			grtaps_cross(crossX, crossY, natbounds);
! 			grtaps_print_coords(oldrealx, oldrealy, stdbounds);
! 			grtaps_print_coords(realx, realy, stdbounds);
! 			grtaps_print_param(oldparam, stdbounds);
! 			grtaps_print_param(param, stdbounds);
  			oldx = x; oldy = y;
  			crossX = dx; crossY = dy;
+ 			oldrealx = realx; oldrealy = realy;
+ 			oldparam = param;
  		}
  	} while (penDown);
  
! 	if (RctPtInRectangle(x, y, natbounds)) {
  		lastParam = param;
  		return true;
***************
*** 749,757 ****
   ***********************************************************************/
  static Boolean
! grtaps_track_func(Coord x,Coord y,RectangleType *bounds) GRAPH;
  static Boolean
! grtaps_track_func(Coord x,Coord y,RectangleType *bounds)
  {
! 	double realx,realy;
  	CodeStack *stack;
  	Boolean penDown;	
--- 731,741 ----
   ***********************************************************************/
  static Boolean
! grtaps_track_func(Coord x, Coord y,
!                   RectangleType *natbounds, RectangleType *stdbounds) GRAPH;
  static Boolean
! grtaps_track_func(Coord x,Coord y,
!                   RectangleType *natbounds, RectangleType *stdbounds)
  {
! 	double realx, realy;
  	CodeStack *stack;
  	Boolean penDown;	
***************
*** 763,791 ****
  	realx = realy = NaN;
  	do {
! 		EvtGetPen(&x, &y, &penDown);
! 		if (gHrMode == hrPalm) {
! 			UInt16 save = WinSetCoordinateSystem(kCoordinatesNative);
! 			x = WinScaleCoord(x, true);
! 			y = WinScaleCoord(y, true);
! 			WinSetCoordinateSystem(save);
! 		}
! 		else {
! 			x *= gSonyFactor;
! 			y *= gSonyFactor;
! 		}
! 		if (crossX!=x && RctPtInRectangle(x,y,bounds)) {
  			realx = graph_xscr2gr(x);
! 			func_get_value(stack,realx, &realy,NULL);
  			y = graph_ygr2scr(realy);
! 			if (!finite(realy) || !RctPtInRectangle(x,y,bounds))
! 			  y = -1;
! 			grtaps_cross(x,y,bounds);
! 			grtaps_cross(crossX,crossY,bounds);
! 			grtaps_print_coords(realx,realy,bounds);
! 			crossX = x;crossY = y;
  		}
! 	}while(penDown);	   	
  	
! 	if (RctPtInRectangle(x, y, bounds)) {
  		lastParam = realx;
  		return true;
--- 747,767 ----
  	realx = realy = NaN;
  	do {
! 		EvtGetPenNat(&x, &y, &penDown);
! 		if (crossX != x && RctPtInRectangle(x, y, natbounds)) {
  			realx = graph_xscr2gr(x);
! 			func_get_value(stack, realx, &realy, NULL);
  			y = graph_ygr2scr(realy);
! 			if (!finite(realy) || !RctPtInRectangle(x, y, natbounds))
! 				y = -1;
! 			grtaps_cross(x, y, natbounds);
! 			grtaps_cross(crossX, crossY, natbounds);
! 			grtaps_print_coords(oldrealx, oldrealy, stdbounds);
! 			grtaps_print_coords(realx, realy, stdbounds);
! 			crossX = x; crossY = y;
! 			oldrealx = realx; oldrealy = realy;
  		}
! 	} while(penDown);	   	
  	
! 	if (RctPtInRectangle(x, y, natbounds)) {
  		lastParam = realx;
  		return true;
***************
*** 811,815 ****
  grtaps_tap(Int16 x,Int16 y)
  {	
! 	RectangleType bounds;
  
  	if (gHrMode == hrPalm) {
--- 787,792 ----
  grtaps_tap(Int16 x,Int16 y)
  {	
! 	RectangleType natbounds;
! 	RectangleType stdbounds;
  
  	if (gHrMode == hrPalm) {
***************
*** 823,850 ****
  	}
  
! 	gadget_bounds(FrmGetActiveForm(), graphGadget, &bounds);
  
! 	if (RctPtInRectangle(x,y,&bounds)) {
  		/* Is zoom-in checked? */
  		if (CtlGetValue(GetObjectPtr(btnGraphZoomIn))) {
! 			if (grtaps_zoom_in(x,y,&bounds)) {
! 				CtlSetValue(GetObjectPtr(btnGraphZoomIn),0);
! 				FrmUpdateForm(frmGraph,frmUpdateVars);
  			}			
  		}	
  		/* Is tracking checked? */
  		else if (CtlGetValue(GetObjectPtr(btnGraphTrack))) {
! 			if (graphPrefs.functype==graph_func)
! 			  grtaps_track_func(x,y,&bounds);
  			else if (graphPrefs.functype == graph_polar)
! 			  grtaps_track_pol(x,y,&bounds);
  			else if (graphPrefs.functype == graph_param)
! 			  grtaps_track_param(x, y, &bounds);
  		}
  		else /* Move the graph */
! 		  if (grtaps_move(x,y,&bounds)) 
! 			FrmUpdateForm(frmGraph,frmUpdateVars);
  		return true;
! 	}	
  	return false;
  }
--- 800,827 ----
  	}
  
! 	gadget_bounds(FrmGetActiveForm(), graphGadget, &natbounds, &stdbounds);
  
! 	if (RctPtInRectangle(x, y, &natbounds)) {
  		/* Is zoom-in checked? */
  		if (CtlGetValue(GetObjectPtr(btnGraphZoomIn))) {
! 			if (grtaps_zoom_in(x, y, &natbounds)) {
! 				CtlSetValue(GetObjectPtr(btnGraphZoomIn), 0);
! 				FrmUpdateForm(frmGraph, frmUpdateVars);
  			}			
  		}	
  		/* Is tracking checked? */
  		else if (CtlGetValue(GetObjectPtr(btnGraphTrack))) {
! 			if (graphPrefs.functype == graph_func)
! 				grtaps_track_func(x, y, &natbounds, &stdbounds);
  			else if (graphPrefs.functype == graph_polar)
! 				grtaps_track_pol(x, y, &natbounds, &stdbounds);
  			else if (graphPrefs.functype == graph_param)
! 				grtaps_track_param(x, y, &natbounds, &stdbounds);
  		}
  		else /* Move the graph */
! 		  if (grtaps_move(x, y, &natbounds)) 
! 			FrmUpdateForm(frmGraph, frmUpdateVars);
  		return true;
! 	}
  	return false;
  }
***************
*** 866,871 ****
  	FormPtr frm = FrmGetActiveForm();
  	
! 	grtaps_track_manual(0,track_add);
! 	FrmShowObject(frm,FrmGetObjectIndex(frm,btnGraphTrackGoto));
  }
  
--- 843,848 ----
  	FormPtr frm = FrmGetActiveForm();
  	
! 	grtaps_track_manual(0, track_add);
! 	FrmShowObject(frm, FrmGetObjectIndex(frm, btnGraphTrackGoto));
  }
  
***************
*** 886,891 ****
  	FormPtr frm = FrmGetActiveForm();
  	
! 	CtlSetValue(GetObjectPtr(btnGraphTrack),false);
! 	FrmHideObject(frm,FrmGetObjectIndex(frm,btnGraphTrackGoto));
  }
  
--- 863,868 ----
  	FormPtr frm = FrmGetActiveForm();
  	
! 	CtlSetValue(GetObjectPtr(btnGraphTrack), false);
! 	FrmHideObject(frm, FrmGetObjectIndex(frm, btnGraphTrackGoto));
  }
  
***************
*** 908,915 ****
  {
  	FormPtr frm = FrmGetActiveForm();
! 	
! 	grtaps_track_manual(start,track_reset);
! 	CtlSetValue(GetObjectPtr(btnGraphTrack),false);
! 	FrmHideObject(frm,FrmGetObjectIndex(frm,btnGraphTrackGoto));
  }
  
--- 885,892 ----
  {
  	FormPtr frm = FrmGetActiveForm();
! 
! 	grtaps_track_manual(start, track_reset);
! 	CtlSetValue(GetObjectPtr(btnGraphTrack), false);
! 	FrmHideObject(frm, FrmGetObjectIndex(frm, btnGraphTrackGoto));
  }
  
***************
*** 929,933 ****
  {
  	trackSelected = track;
! 	CtlSetValue(GetObjectPtr(btnGraphTrack),true);
  	grtaps_track_start();
  }
--- 906,910 ----
  {
  	trackSelected = track;
! 	CtlSetValue(GetObjectPtr(btnGraphTrack), true);
  	grtaps_track_start();
  }

Index: grprefs.c
===================================================================
RCS file: /cvsroot/easycalc/easycalc/grprefs.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** grprefs.c	19 Oct 2006 19:39:50 -0000	1.25
--- grprefs.c	10 Nov 2006 04:12:56 -0000	1.26
***************
*** 85,89 ****
  #ifdef SUPPORT_DIA
  	FormType *frm;
! 	RectangleType bounds;
  #endif
  
--- 85,90 ----
  #ifdef SUPPORT_DIA
  	FormType *frm;
! 	RectangleType natbounds;
! 	RectangleType stdbounds;
  #endif
  
***************
*** 115,119 ****
  		graphPrefs.logy = false;
  		graphPrefs.speed = 1;
! 		for (i=0; i<9; i++){
  			graphPrefs.grEnable[i] = true;
  			if (colorDisplay)
--- 116,120 ----
  		graphPrefs.logy = false;
  		graphPrefs.speed = 1;
! 		for (i=0; i<8; i++){
  			graphPrefs.grEnable[i] = true;
  			if (colorDisplay)
***************
*** 122,125 ****
--- 123,127 ----
  				graphPrefs.colors[i] = funcolors[i];
  		}
+ 		graphPrefs.grEnable[8] = true;
  		for (i=0; i<6; i++)
  			graphPrefs.grType[i] = 1;
***************
*** 134,143 ****
  		VgaFormModify(frm, vgaFormModify160To240);
  #endif
! 	gadget_bounds(frm, graphGadget, &bounds);
  	FrmDeleteForm(frm);
! 	ScrPrefs.xmin = bounds.topLeft.x;
! 	ScrPrefs.ymax = bounds.topLeft.y;
! 	ScrPrefs.xmax = bounds.topLeft.x + bounds.extent.x - 1;
! 	ScrPrefs.ymin = bounds.topLeft.y + bounds.extent.y - 1;
  	ScrPrefs.xtrans = (double)(ScrPrefs.xmax - ScrPrefs.xmin) /
  	                          (graphPrefs.xmax - graphPrefs.xmin);
--- 136,145 ----
  		VgaFormModify(frm, vgaFormModify160To240);
  #endif
! 	gadget_bounds(frm, graphGadget, &natbounds, &stdbounds);
  	FrmDeleteForm(frm);
! 	ScrPrefs.xmin = natbounds.topLeft.x;
! 	ScrPrefs.ymax = natbounds.topLeft.y;
! 	ScrPrefs.xmax = natbounds.topLeft.x + natbounds.extent.x - 1;
! 	ScrPrefs.ymin = natbounds.topLeft.y + natbounds.extent.y - 1;
  	ScrPrefs.xtrans = (double)(ScrPrefs.xmax - ScrPrefs.xmin) /
  	                          (graphPrefs.xmax - graphPrefs.xmin);
***************
*** 163,167 ****
  #ifdef SUPPORT_DIA
  	FormType *frm;
! 	RectangleType bounds;
  	Coord dx, dy;
  
--- 165,170 ----
  #ifdef SUPPORT_DIA
  	FormType *frm;
! 	RectangleType natbounds;
! 	RectangleType stdbounds;
  	Coord dx, dy;
  
***************
*** 175,182 ****
  		VgaFormModify(frm, vgaFormModify160To240);
  #endif
! 	gadget_bounds(frm, graphGadget, &bounds);
  	FrmDeleteForm(frm);
! 	dx = bounds.topLeft.x + bounds.extent.x - 1 - ScrPrefs.xmax;
! 	dy = bounds.topLeft.y + bounds.extent.y - 1 - ScrPrefs.ymin;
  	if (dx)
  		graphPrefs.xmax += dx / ScrPrefs.xtrans;
--- 178,185 ----
  		VgaFormModify(frm, vgaFormModify160To240);
  #endif
! 	gadget_bounds(frm, graphGadget, &natbounds, &stdbounds);
  	FrmDeleteForm(frm);
! 	dx = natbounds.topLeft.x + natbounds.extent.x - 1 - ScrPrefs.xmax;
! 	dy = natbounds.topLeft.y + natbounds.extent.y - 1 - ScrPrefs.ymin;
  	if (dx)
  		graphPrefs.xmax += dx / ScrPrefs.xtrans;

[Easycalc-commits] easycalc/langs sp.rcp,1.42,1.43

From: Jorge G. <cl...@us...> - 2006-10-20 16:33:32

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

Modified Files:
	sp.rcp 
Log Message:
shortened strings

Index: sp.rcp
===================================================================
RCS file: /cvsroot/easycalc/easycalc/langs/sp.rcp,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** sp.rcp	22 Sep 2006 20:05:14 -0000	1.42
--- sp.rcp	20 Oct 2006 16:33:28 -0000	1.43
***************
*** 114,119 ****
  "$$GRAPH"		=	"Gráficos"
  "$$PREFERENCES..."	=	"Preferencias..."
! "$$DEFINITION..."	=	"Administrador de Datos..."
! "$$FINANCIAL..."	=	"Administrador Financiero..."
  /**************************************************/
  "$$SOLVER..."           =       "Solver..."
--- 114,119 ----
  "$$GRAPH"		=	"Gráficos"
  "$$PREFERENCES..."	=	"Preferencias..."
! "$$DEFINITION..."	=	"Administr. de Datos..."
! "$$FINANCIAL..."	=	"Administr. Financiero..."
  /**************************************************/
  "$$SOLVER..."           =       "Solver..."

[Easycalc-commits] easycalc grsetup.c,1.30,1.31

From: Jorge G. <cl...@us...> - 2006-10-19 19:40:51

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

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

Index: grsetup.c
===================================================================
RCS file: /cvsroot/easycalc/easycalc/grsetup.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** grsetup.c	19 Oct 2006 16:14:24 -0000	1.30
--- grsetup.c	19 Oct 2006 19:40:48 -0000	1.31
***************
*** 274,289 ****
  	StrCopy(text,grsetup_fn_descr(row+firstVisible));
  	StrCat(text,":");
- 	if (palmOS35)
- 		WinPushDrawState();
- 	if (grayDisplay || colorDisplay) {
- 	   	if (graphPrefs.functype==graph_param) 
- 			WinSetTextColor(graphPrefs.colors[(row+firstVisible)/2]);
- 	   	else
- 			WinSetTextColor(graphPrefs.colors[row+firstVisible]);
- 	} 
  	x = bounds->topLeft.x+bounds->extent.x-FntCharsWidth(text,StrLen(text))-2;
  	WinDrawChars(text,StrLen(text),x,bounds->topLeft.y);
- 	if (palmOS35)
- 		WinPopDrawState(); 
  }
  
--- 274,279 ----
***************
*** 331,335 ****
  		firstVisible = 0;
  
! 	CtlSetValue(GetObjectPtr(ckbGrGrid), graphPrefs.grid);
  
  	/* Setup the up/down pointers, grType and grColor buttons*/
--- 321,326 ----
  		firstVisible = 0;
  
! 	CtlSetValue(GetObjectPtr(ckbGrAxes), graphPrefs.grEnable[6]);
! 	CtlSetValue(GetObjectPtr(ckbGrGrid), graphPrefs.grEnable[7]);
  
  	/* Setup the up/down pointers, grType and grColor buttons*/
***************
*** 346,350 ****
  		}
  	} else {
! 		for (i = grType2; i <= grType6; i += 2)
  			FrmShowObject(frm, FrmGetObjectIndex(frm, i));
  	}
--- 337,341 ----
  		}
  	} else {
! 		for (i = ckbGrfun2; i <= grType6; i += 2)
  			FrmShowObject(frm, FrmGetObjectIndex(frm, i));
  	}
***************
*** 512,516 ****
  	 * will be released by db_delete_list with dblist */
  	txtnone[0] = ' ';
! 	SysCopyStringResource(txtnone+1,grSetupNone);
  	txtuser[0] = ' ';
  	SysCopyStringResource(txtuser+1,grSetupUser);	
--- 503,507 ----
  	 * will be released by db_delete_list with dblist */
  	txtnone[0] = ' ';
! 	SysCopyStringResource(txtnone+1,strLocalDelete);
  	txtuser[0] = ' ';
  	SysCopyStringResource(txtuser+1,grSetupUser);	
***************
*** 542,547 ****
  	
  	if (i!=noListSelection && i!=pos) {
! 		if (i==0) 
  		  StrCopy(fname,"");
  		else if (i==1) { /* The 'User' function get always edit window */
  			SysCopyStringResource(tmptxt,grSetupStrFunc);
--- 533,540 ----
  	
  	if (i!=noListSelection && i!=pos) {
! 		if (i==0){
  		  StrCopy(fname,"");
+ 		  db_delete_record(grsetup_def_name(row));
+ 		}
  		else if (i==1) { /* The 'User' function get always edit window */
  			SysCopyStringResource(tmptxt,grSetupStrFunc);
***************
*** 577,586 ****
  			WinEraseRectangle(&bounds, 0);
  			graph_unsetcolor();
  
  			x = bounds.topLeft.x;
  			y = bounds.topLeft.y + bounds.extent.y - 1;
! 			x1 = x + HanderaCoord(1);
! 			x2 = x + HanderaCoord(3);
! 			x3 = x + HanderaCoord(5);
  			y1 = y - HanderaCoord(1);
  			y2 = y - HanderaCoord(3);
--- 570,580 ----
  			WinEraseRectangle(&bounds, 0);
  			graph_unsetcolor();
+ 			WinDrawRectangleFrame(roundFrame, &bounds);
  
  			x = bounds.topLeft.x;
  			y = bounds.topLeft.y + bounds.extent.y - 1;
! 			x1 = x + HanderaCoord(3);
! 			x2 = x + HanderaCoord(6);
! 			x3 = x + HanderaCoord(9);
  			y1 = y - HanderaCoord(1);
  			y2 = y - HanderaCoord(3);
***************
*** 591,594 ****
--- 585,591 ----
  			else
  				k = i;
+ 
+ 			CtlSetValue(GetObjectPtr(ckbGrfun1+i), graphPrefs.grEnable[k]);
+ 
  			graph_setcolor(k);
  			switch (graphPrefs.grType[k]) {
***************
*** 617,623 ****
  	for (i=0; i<3; i++) {
  		if (grayDisplay || colorDisplay) {
! 			graph_setcolor(i < 2 ? -1 : -2); 
! 			FrmGetObjectBounds(frm, FrmGetObjectIndex(frm,grBgnd+i), &bounds);
! 			if (i == 0 ) {
  				WinEraseRectangle(&bounds, 0);
  			} else {
--- 614,620 ----
  	for (i=0; i<3; i++) {
  		if (grayDisplay || colorDisplay) {
! 			graph_setcolor(i == 1 ? -2 : -1); 
! 			FrmGetObjectBounds(frm, FrmGetObjectIndex(frm,grAxes+i), &bounds);
! 			if (i == 2 ) {
  				WinEraseRectangle(&bounds, 0);
  			} else {
***************
*** 696,700 ****
  		switch (controlId) {
  		 case grSetupDone:
! 			graphPrefs.grid = CtlGetValue(GetObjectPtr(ckbGrGrid));
  			grSetupOpen = false;
  			FrmReturnToForm(0);
--- 693,698 ----
  		switch (controlId) {
  		 case grSetupDone:
! 			graphPrefs.grEnable[6] = CtlGetValue(GetObjectPtr(ckbGrAxes));
! 			graphPrefs.grEnable[7] = CtlGetValue(GetObjectPtr(ckbGrGrid));
  			grSetupOpen = false;
  			FrmReturnToForm(0);
***************
*** 712,715 ****
--- 710,714 ----
  			handled = true;
  			break;
+ 		 case ckbGrfun1:
  		 case grType1:
  		 case grColor1:
***************
*** 719,726 ****
--- 718,727 ----
  				row = 0;
  			break;
+ 		 case ckbGrfun2:
  		 case grType2:
  		 case grColor2:
  			row = 1;
  			break;
+ 		 case ckbGrfun3:
  		 case grType3:
  		 case grColor3:
***************
*** 730,737 ****
--- 731,740 ----
  				row = 2;
  			break;
+ 		 case ckbGrfun4:
  		 case grType4:
  		 case grColor4:
  			row = 3;
  			break;
+ 		 case ckbGrfun5:
  		 case grType5:
  		 case grColor5:
***************
*** 741,744 ****
--- 744,748 ----
  				row = 4;
  			break;
+ 		 case ckbGrfun6:
  		 case grType6:
  		 case grColor6:
***************
*** 752,756 ****
  		}
  
! 		if (controlId >= grType1 && controlId <= grType6) {
  			graphPrefs.grType[row]++;
  			if(graphPrefs.grType[row]>2)
--- 756,764 ----
  		}
  
! 		if (controlId >= ckbGrfun1 && controlId <= ckbGrfun6) {
! 			graphPrefs.grEnable[row] = CtlGetValue(GetObjectPtr(controlId));
! 			handled=true;
! 		}
! 		else if (controlId >= grType1 && controlId <= grType6) {
  			graphPrefs.grType[row]++;
  			if(graphPrefs.grType[row]>2)
***************
*** 759,763 ****
  			handled=true;
  		}
! 		else if (controlId >= grColor1 && controlId <= grGrid) {
  			IndexedColorType col = graphPrefs.colors[row];
  			RGBColorType rgb;
--- 767,771 ----
  			handled=true;
  		}
! 		else if (controlId >= grColor1 && controlId <= grBgnd) {
  			IndexedColorType col = graphPrefs.colors[row];
  			RGBColorType rgb;

[Easycalc-commits] easycalc grprefs.h,1.11,1.12

From: Jorge G. <cl...@us...> - 2006-10-19 19:40:20

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

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

Index: grprefs.h
===================================================================
RCS file: /cvsroot/easycalc/easycalc/grprefs.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** grprefs.h	12 Sep 2006 19:40:55 -0000	1.11
--- grprefs.h	19 Oct 2006 19:40:16 -0000	1.12
***************
*** 49,55 ****
  	char funcPar[MAX_GRFUNCS][2][MAX_FUNCNAME+1];
  	Boolean logx,logy;
- 	Boolean grid;
  	Int16 speed;
! 	IndexedColorType colors[10];
  	Int8 grType[6];
  }TgrPrefs;
--- 49,55 ----
  	char funcPar[MAX_GRFUNCS][2][MAX_FUNCNAME+1];
  	Boolean logx,logy;
  	Int16 speed;
! 	IndexedColorType colors[9];
! 	Boolean grEnable[9];
  	Int8 grType[6];
  }TgrPrefs;

[Easycalc-commits] easycalc grprefs.c,1.24,1.25

From: Jorge G. <cl...@us...> - 2006-10-19 19:39:56

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

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

Index: grprefs.c
===================================================================
RCS file: /cvsroot/easycalc/easycalc/grprefs.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** grprefs.c	16 Oct 2006 18:58:37 -0000	1.24
--- grprefs.c	19 Oct 2006 19:39:50 -0000	1.25
***************
*** 54,64 ****
  	{0,0,128,128},
  	{0,128,0,128},
- 	{0,255,255,255}, /* background */
  	{0,0,0,0},       /* axis */
! 	{0,128,128,128}  /* grid */
  };
  
! /* Gray colors: 6 funcs + backgrnd + axis + grid + index*/
! IndexedColorType funcolors[10]={15,11,7,13,9,5,0,15,8,0}; 
  
  /* Display mode for preferences */
--- 54,64 ----
  	{0,0,128,128},
  	{0,128,0,128},
  	{0,0,0,0},       /* axis */
! 	{0,128,128,128},  /* grid */
! 	{0,255,255,255} /* background */
  };
  
! /* Gray colors: 6 funcs + axis + grid + backgrnd */
! IndexedColorType funcolors[9]={15,11,7,13,9,5,15,8,0}; 
  
  /* Display mode for preferences */
***************
*** 114,126 ****
  		graphPrefs.logx = false;
  		graphPrefs.logy = false;
- 		graphPrefs.grid = false;
  		graphPrefs.speed = 1;
! 		if (colorDisplay) {
! 			for (i=0; i<9; i++)
  				graphPrefs.colors[i] = WinRGBToIndex(&graphRGBColors[i]);
! 			graphPrefs.colors[9] = funcolors[9]; /* index of selected function */
! 		}
! 		if (grayDisplay) {
! 			for (i=0; i<10; i++)
  				graphPrefs.colors[i] = funcolors[i];
  		}
--- 114,123 ----
  		graphPrefs.logx = false;
  		graphPrefs.logy = false;
  		graphPrefs.speed = 1;
! 		for (i=0; i<9; i++){
! 			graphPrefs.grEnable[i] = true;
! 			if (colorDisplay)
  				graphPrefs.colors[i] = WinRGBToIndex(&graphRGBColors[i]);
! 			if (grayDisplay)
  				graphPrefs.colors[i] = funcolors[i];
  		}

[Easycalc-commits] easycalc graph.rcp.in,1.35,1.36

From: Jorge G. <cl...@us...> - 2006-10-19 19:38:39

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

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

Index: graph.rcp.in
===================================================================
RCS file: /cvsroot/easycalc/easycalc/graph.rcp.in,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** graph.rcp.in	16 Oct 2006 18:58:37 -0000	1.35
--- graph.rcp.in	19 Oct 2006 19:38:36 -0000	1.36
***************
*** 40,64 ****
     TITLE "$$SETUP GRAPHS"
  
!    BUTTON " " ID grAxes AT (3 16 6 6) RECTFRAME NONUSABLE
!    CHECKBOX "Axes" ID ckbGrAxes AT (10 13 AUTO AUTO)
!    BUTTON " " ID grGrid AT (63 16 6 6) RECTFRAME NONUSABLE
!    CHECKBOX "Grid" ID ckbGrGrid AT (70 13 AUTO AUTO)
!    BUTTON " " ID grBgnd AT (121 16 6 6) RECTFRAME NONUSABLE
!    LABEL "Bgnd" ID grBgndLbl AT (135 13) NONUSABLE
     
!    TABLE ID grSetupTable AT (5 27 132 70) ROWS 6 COLUMNS 2 COLUMNWIDTHS 20 112
  
!    BUTTON " " ID grType1 AT (139 29 7 7) RECTFRAME
!    BUTTON " " ID grColor1 AT (PREVRIGHT+1 PREVTOP 7 7) RECTFRAME NONUSABLE
!    BUTTON " " ID grType2 AT (139 40 7 7) RECTFRAME NONUSABLE
!    BUTTON " " ID grColor2 AT (PREVRIGHT+1 PREVTOP 7 7) RECTFRAME NONUSABLE
!    BUTTON " " ID grType3 AT (139 51 7 7) RECTFRAME
!    BUTTON " " ID grColor3 AT (PREVRIGHT+1 PREVTOP 7 7) RECTFRAME NONUSABLE
!    BUTTON " " ID grType4 AT (139 62 7 7) RECTFRAME NONUSABLE
!    BUTTON " " ID grColor4 AT (PREVRIGHT+1 PREVTOP 7 7) RECTFRAME NONUSABLE
!    BUTTON " " ID grType5 AT (139 73 7 7) RECTFRAME
!    BUTTON " " ID grColor5 AT (PREVRIGHT+1 PREVTOP 7 7) RECTFRAME NONUSABLE
!    BUTTON " " ID grType6 AT (139 84 7 7) RECTFRAME NONUSABLE
!    BUTTON " " ID grColor6 AT (PREVRIGHT+1 PREVTOP 7 7) RECTFRAME NONUSABLE
  
     BUTTON "$$DONE" ID grSetupDone AT (5 100 40 12)
--- 40,72 ----
     TITLE "$$SETUP GRAPHS"
  
!    BUTTON " " ID grAxes AT (5 17 6 6) RECTFRAME NONUSABLE
!    CHECKBOX "Axes" ID ckbGrAxes AT (12 14 AUTO AUTO)
!    BUTTON " " ID grGrid AT (63 17 6 6) RECTFRAME NONUSABLE
!    CHECKBOX "Grid" ID ckbGrGrid AT (70 14 AUTO AUTO)
!    BUTTON " " ID grBgnd AT (119 17 6 6) RECTFRAME NONUSABLE
!    LABEL "Bgnd" ID grBgndLbl AT (133 14) NONUSABLE
! 
!    BUTTON " " ID grColor1 AT (5 32 6 6) RECTFRAME NONUSABLE
!    BUTTON " " ID grColor2 AT (5 43 6 6) RECTFRAME NONUSABLE
!    BUTTON " " ID grColor3 AT (5 54 6 6) RECTFRAME NONUSABLE
!    BUTTON " " ID grColor4 AT (5 65 6 6) RECTFRAME NONUSABLE
!    BUTTON " " ID grColor5 AT (5 76 6 6) RECTFRAME NONUSABLE
!    BUTTON " " ID grColor6 AT (5 87 6 6) RECTFRAME NONUSABLE
     
!    CHECKBOX "" ID ckbGrfun1 AT (12 29 AUTO AUTO)
!    CHECKBOX "" ID ckbGrfun2 AT (12 40 AUTO AUTO) NONUSABLE
!    CHECKBOX "" ID ckbGrfun3 AT (12 51 AUTO AUTO)
!    CHECKBOX "" ID ckbGrfun4 AT (12 62 AUTO AUTO) NONUSABLE
!    CHECKBOX "" ID ckbGrfun5 AT (12 73 AUTO AUTO)
!    CHECKBOX "" ID ckbGrfun6 AT (12 84 AUTO AUTO) NONUSABLE
  
!    TABLE ID grSetupTable AT (25 29 112 67) ROWS 6 COLUMNS 2 COLUMNWIDTHS 16 94
! 
!    BUTTON " " ID grType1 AT (139 31 13 7) NOFRAME
!    BUTTON " " ID grType2 AT (139 42 13 7) NOFRAME NONUSABLE
!    BUTTON " " ID grType3 AT (139 53 13 7) NOFRAME
!    BUTTON " " ID grType4 AT (139 64 13 7) NOFRAME NONUSABLE
!    BUTTON " " ID grType5 AT (139 75 13 7) NOFRAME
!    BUTTON " " ID grType6 AT (139 86 13 7) NOFRAME NONUSABLE
  
     BUTTON "$$DONE" ID grSetupDone AT (5 100 40 12)
***************
*** 70,73 ****
--- 78,82 ----
  END
  
+ 
  FORM ID grPrefForm AT (2 2 156 156)
  MODAL
***************
*** 116,120 ****
  END
  
! STRINGTABLE grColorElem "Pick color for " "fun1" "fun2" "fun3" "fun4" "fun5" "fun6" "$$BACKGRND" "$$AXIS" "$$GRID"
  
  FORM ID frmGraph AT (0 0 160 160)
--- 125,129 ----
  END
  
! STRINGTABLE grColorElem "Pick color for " "fun1" "fun2" "fun3" "fun4" "fun5" "fun6" "$$AXIS" "$$GRID" "$$BACKGRND"
  
  FORM ID frmGraph AT (0 0 160 160)

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

From: Jorge G. <cl...@us...> - 2006-10-19 19:37:34

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++;

[Easycalc-commits] easycalc calcrsc.h,1.62,1.63

From: Jorge G. <cl...@us...> - 2006-10-19 19:37:05

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

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

Index: calcrsc.h
===================================================================
RCS file: /cvsroot/easycalc/easycalc/calcrsc.h,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** calcrsc.h	16 Oct 2006 18:58:37 -0000	1.62
--- calcrsc.h	19 Oct 2006 19:36:53 -0000	1.63
***************
*** 364,386 ****
  #define grSetupNone     4509
  #define grSetupUser     4510
! #define grType1     	4511
! #define grType2     	4512
! #define grType3     	4513
! #define grType4     	4514
! #define grType5     	4515
! #define grType6     	4516
! #define grColor1     	4517
! #define grColor2     	4518
! #define grColor3     	4519
! #define grColor4     	4520
! #define grColor5     	4521
! #define grColor6     	4522
! #define grBgnd		4523
! #define grAxes		4524
! #define grGrid		4525
! #define grBgndLbl	4526
! #define ckbGrAxes	4527
! #define ckbGrGrid	4528
! #define grColorElem	4529
  
  #define grTableForm     4600
--- 364,393 ----
  #define grSetupNone     4509
  #define grSetupUser     4510
! #define ckbGrfun1	4511
! #define ckbGrfun2	4512
! #define ckbGrfun3	4513
! #define ckbGrfun4	4514
! #define ckbGrfun5	4515
! #define ckbGrfun6	4516
! #define ckbGrAxes	4517
! #define ckbGrGrid	4518
! #define grType1     	4519
! #define grType2     	4520
! #define grType3     	4521
! #define grType4     	4522
! #define grType5     	4523
! #define grType6     	4524
! #define grColor1     	4525
! #define grColor2     	4526
! #define grColor3     	4527
! #define grColor4     	4528
! #define grColor5     	4529
! #define grColor6     	4530
! #define grAxes		4531
! #define grGrid		4532
! #define grBgnd		4533
! #define grBgndLbl	4534
! #define grColorElem	4535
! 
  
  #define grTableForm     4600

[Easycalc-commits] easycalc grsetup.c,1.29,1.30

From: Ton v. O. <tvo...@us...> - 2006-10-19 16:14:34

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

Modified Files:
	grsetup.c 
Log Message:
Fix bug in yesterdays commit.


Index: grsetup.c
===================================================================
RCS file: /cvsroot/easycalc/easycalc/grsetup.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** grsetup.c	19 Oct 2006 01:46:38 -0000	1.29
--- grsetup.c	19 Oct 2006 16:14:24 -0000	1.30
***************
*** 43,46 ****
--- 43,47 ----
  static Int16 firstVisible = 0;
  static Int16 selectedRow;
+ static Boolean grSetupOpen = false;
  
  static char *tblFuncs[] = {"Y1","Y2","Y3","Y4","Y5","Y6"};
***************
*** 696,699 ****
--- 697,701 ----
  		 case grSetupDone:
  			graphPrefs.grid = CtlGetValue(GetObjectPtr(ckbGrGrid));
+ 			grSetupOpen = false;
  			FrmReturnToForm(0);
  			FrmUpdateForm(frmGraph, frmUpdateVars);
***************
*** 786,796 ****
  		break;
  	 case winEnterEvent:
! 		if (event->data.winEnter.enterWindow == (WinHandle) frm)
  			draw_grType(frm);
  		break;
  	 case frmCloseEvent:
  		handled = false;
  		break;
  	 case frmOpenEvent:
  		grsetup_tbl_init();
  		FrmDrawForm(frm);
--- 788,801 ----
  		break;
  	 case winEnterEvent:
! 		if (grSetupOpen &&
! 		    event->data.winEnter.enterWindow == (WinHandle) frm) 
  			draw_grType(frm);
  		break;
  	 case frmCloseEvent:
+ 		grSetupOpen = false;
  		handled = false;
  		break;
  	 case frmOpenEvent:
+ 		grSetupOpen = true;
  		grsetup_tbl_init();
  		FrmDrawForm(frm);

[Easycalc-commits] easycalc graph.c,1.51,1.52 grsetup.c,1.28,1.29

From: Ton v. O. <tvo...@us...> - 2006-10-19 01:46:45

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

Modified Files:
	graph.c grsetup.c 
Log Message:
Bugfixes for redrawing the graph form when partially obscured by the graph
setup form.


Index: grsetup.c
===================================================================
RCS file: /cvsroot/easycalc/easycalc/grsetup.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** grsetup.c	16 Oct 2006 18:58:37 -0000	1.28
--- grsetup.c	19 Oct 2006 01:46:38 -0000	1.29
***************
*** 785,788 ****
--- 785,792 ----
  		}		  
  		break;
+ 	 case winEnterEvent:
+ 		if (event->data.winEnter.enterWindow == (WinHandle) frm)
+ 			draw_grType(frm);
+ 		break;
  	 case frmCloseEvent:
  		handled = false;

Index: graph.c
===================================================================
RCS file: /cvsroot/easycalc/easycalc/graph.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** graph.c	16 Oct 2006 18:58:37 -0000	1.51
--- graph.c	19 Oct 2006 01:46:38 -0000	1.52
***************
*** 89,93 ****
  {
  	if (palmOS35)
! 	  WinPushDrawState();
  
  	if (grayDisplay || colorDisplay) {
--- 89,93 ----
  {
  	if (palmOS35)
! 		WinPushDrawState();
  
  	if (grayDisplay || colorDisplay) {
***************
*** 118,122 ****
  {
  	if (palmOS35)
! 	  WinPopDrawState();
  }
  
--- 118,122 ----
  {
  	if (palmOS35)
! 		WinPopDrawState();
  }
  
***************
*** 453,457 ****
  graph_init_screen(FormPtr frm,UInt16 graphId)
  {
! 	RectangleType bounds;
  	Coord x, y;
  #ifdef SUPPORT_DIA
--- 453,459 ----
  graph_init_screen(FormPtr frm,UInt16 graphId)
  {
! 	RectangleType stdbounds; // bounds in standard coordinates
! 	RectangleType natbounds; // bounds in native coordinates
! 	RectangleType clip;      // clip rectangle in standard coordinates
  	Coord x, y;
  #ifdef SUPPORT_DIA
***************
*** 459,469 ****
  #endif
  
- 	WinResetClip();
  	/* Check, if the bounds are correct */
! 	gadget_bounds(frm, graphId, &bounds);
  #ifdef SUPPORT_DIA
  	/* Adjust in case of window resize */
! 	dx = bounds.topLeft.x + bounds.extent.x - 1 - ScrPrefs.xmax;
! 	dy = bounds.topLeft.y + bounds.extent.y - 1 - ScrPrefs.ymin;
  	if (dx)
  		graphPrefs.xmax += dx / ScrPrefs.xtrans;
--- 461,470 ----
  #endif
  
  	/* Check, if the bounds are correct */
! 	gadget_bounds(frm, graphId, &natbounds);
  #ifdef SUPPORT_DIA
  	/* Adjust in case of window resize */
! 	dx = natbounds.topLeft.x + natbounds.extent.x - 1 - ScrPrefs.xmax;
! 	dy = natbounds.topLeft.y + natbounds.extent.y - 1 - ScrPrefs.ymin;
  	if (dx)
  		graphPrefs.xmax += dx / ScrPrefs.xtrans;
***************
*** 476,504 ****
  		graphPrefs.ymin = MIN_LOG_VAL;
  
! 	ScrPrefs.xmin=bounds.topLeft.x;
! 	ScrPrefs.ymax=bounds.topLeft.y;
! 	ScrPrefs.xmax=ScrPrefs.xmin+bounds.extent.x-1;
! 	ScrPrefs.ymin=ScrPrefs.ymax+bounds.extent.y-1;
  	cacheTrans();
  
  	/* Draw the drawing area */
! 	clie_drawrectangleframe(1,&bounds);
  	graph_setcolor(-1);
! 	clie_eraserectangle(&bounds,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();
! 	
! 	if (graphPrefs.grid)
! 		graph_grid(&bounds);
  }
  
--- 477,511 ----
  		graphPrefs.ymin = MIN_LOG_VAL;
  
! 	ScrPrefs.xmin=natbounds.topLeft.x;
! 	ScrPrefs.ymax=natbounds.topLeft.y;
! 	ScrPrefs.xmax=ScrPrefs.xmin+natbounds.extent.x-1;
! 	ScrPrefs.ymin=ScrPrefs.ymax+natbounds.extent.y-1;
  	cacheTrans();
  
  	/* Draw the drawing area */
! 	clie_drawrectangleframe(1,&natbounds);
  	graph_setcolor(-1);
! 	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();
! 
! 	/* Only (re)draw grid when whole graph gadget is inside the
! 	   clip rectangle */
! 	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)
! 		graph_grid(&natbounds);
  }

2 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 8 9 10 11 12 .. 14 > >> (Page 10 of 14)

2006	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (36)	Sep (44)	Oct (25)	Nov (2)	Dec (5)
2007	Jan (1)	Feb (1)	Mar	Apr	May (9)	Jun	Jul (4)	Aug (8)	Sep (16)	Oct	Nov (2)	Dec (28)
2008	Jan	Feb (2)	Mar	Apr	May (11)	Jun	Jul	Aug	Sep (2)	Oct	Nov	Dec
2009	Jan	Feb	Mar	Apr	May	Jun (33)	Jul (5)	Aug (7)	Sep (9)	Oct (31)	Nov (25)	Dec (21)
2011	Jan (2)	Feb (12)	Mar	Apr (7)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec