[Easycalc-commits] PPCport/core grsetup.cpp,1.1,1.2

[Mapi B. <ma...@us...>]

Update of /cvsroot/easycalc/PPCport/core
In directory vz-cvs-4.sog:/tmp/cvs-serv3093

Modified Files:
	grsetup.cpp 
Log Message:
1.25g-1

Index: grsetup.cpp
===================================================================
RCS file: /cvsroot/easycalc/PPCport/core/grsetup.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** grsetup.cpp	28 Feb 2011 22:07:18 -0000	1.1
--- grsetup.cpp	14 Apr 2011 19:22:24 -0000	1.2
***************
*** 60,64 ****
   * 
   * DESCRIPTION:  Setup the array with names and positions of 
!  *               existing user selected functions
   *
   * PARAMETERS:   descr[MAX_GRFUNCS] - array that will contain 
--- 60,64 ----
   * 
   * DESCRIPTION:  Setup the array with names and positions of 
!  *               existing and activated user selected functions.
   *
   * PARAMETERS:   descr[MAX_GRFUNCS] - array that will contain 
***************
*** 70,90 ****
   ***********************************************************************/
  int grsetup_fn_descr_arr (TCHAR **descr, int *nums) {
! 	int i, count;
  
! 	for (i=0,count=0 ; i<MAX_GRFUNCS ; i++) {
!         if ((graphPrefs.functype == graph_param)
!             && (StrLen(grsetup_get_fname(i*2)))
!             && (StrLen(grsetup_get_fname(i*2+1)))) {
! 			descr[count] = (TCHAR *) grsetup_fn_descr(i*2);
! 			nums[count] = i;
! 			count++;
! 		} else if ((graphPrefs.functype != graph_param)
!                    && (StrLen(grsetup_get_fname(i)))) {
! 			descr[count] = (TCHAR *) grsetup_fn_descr(i);
! 			nums[count] = i;
! 			count++;
! 		}
! 	}
! 	return (count);
  }
  
--- 70,92 ----
   ***********************************************************************/
  int grsetup_fn_descr_arr (TCHAR **descr, int *nums) {
!     int i, count;
  
!     for (i=0,count=0 ; i<MAX_GRFUNCS ; i++) {
!         // Mapi: only select those which are enabled on display
!         if (graphPrefs.grEnable[graphPrefs.functype][i])
!             if ((graphPrefs.functype == graph_param)
!                 && (StrLen(grsetup_get_fname(i*2)))
!                 && (StrLen(grsetup_get_fname(i*2+1)))) {
!                 descr[count] = (TCHAR *) grsetup_fn_descr(i*2);
!                 nums[count] = i;
!                 count++;
!             } else if ((graphPrefs.functype != graph_param)
!                        && (StrLen(grsetup_get_fname(i)))) {
!                 descr[count] = (TCHAR *) grsetup_fn_descr(i);
!                 nums[count] = i;
!                 count++;
!             }
!     }
!     return (count);
  }