[BACK]Return to imach.c CVS log [TXT] [DIR] Up to [Local Repository] / imach / src

Diff for /imach/src/imach.c between versions 1.107 and 1.108

version 1.107, 2006/01/19 16:20:37 version 1.108, 2006/01/19 18:05:42
Line 1 Line 1
 /* $Id$  /* $Id$
   $State$    $State$
   $Log$    $Log$
     Revision 1.108  2006/01/19 18:05:42  lievre
     Gnuplot problem appeared...
     To be fixed
   
   Revision 1.107  2006/01/19 16:20:37  brouard    Revision 1.107  2006/01/19 16:20:37  brouard
   Test existence of gnuplot in imach path    Test existence of gnuplot in imach path
   
Line 243  extern int errno; Line 247  extern int errno;
 /* #define _(String) gettext (String) */  /* #define _(String) gettext (String) */
   
 #define MAXLINE 256  #define MAXLINE 256
   
 #define GNUPLOTPROGRAM "gnuplot"  #define GNUPLOTPROGRAM "gnuplot"
 /*#define GNUPLOTPROGRAM "..\\gp37mgw\\wgnuplot"*/  /*#define GNUPLOTPROGRAM "..\\gp37mgw\\wgnuplot"*/
 #define FILENAMELENGTH 132  #define FILENAMELENGTH 132
 /*#define DEBUG*/  
 /*#define windows*/  
 #define GLOCK_ERROR_NOPATH              -1      /* empty path */  #define GLOCK_ERROR_NOPATH              -1      /* empty path */
 #define GLOCK_ERROR_GETCWD              -2      /* cannot get cwd */  #define GLOCK_ERROR_GETCWD              -2      /* cannot get cwd */
   
Line 4664  int main(int argc, char *argv[]) Line 4668  int main(int argc, char *argv[])
             }              }
         }          }
         else if(s[m][i] !=9){ /* Standard case, age in fractional          else if(s[m][i] !=9){ /* Standard case, age in fractional
                                  years but with the precision of a                                   years but with the precision of a month */
                                  month */  
           agev[m][i]=(mint[m][i]/12.+1./24.+anint[m][i])-(moisnais[i]/12.+1./24.+annais[i]);            agev[m][i]=(mint[m][i]/12.+1./24.+anint[m][i])-(moisnais[i]/12.+1./24.+annais[i]);
           if((int)mint[m][i]==99 || (int)anint[m][i]==9999)            if((int)mint[m][i]==99 || (int)anint[m][i]==9999)
             agev[m][i]=1;              agev[m][i]=1;
Line 5550  lsurv=vector(1,AGESUP); Line 5553  lsurv=vector(1,AGESUP);
   
   chdir(path);    chdir(path);
 #ifndef UNIX  #ifndef UNIX
   strcpy(plotcmd,"\"");    /*  strcpy(plotcmd,"\""); */
 #endif  #endif
   strcat(plotcmd,pathimach);    strcpy(plotcmd,pathimach);
   /*strcat(plotcmd,CHARSEPARATOR);*/    /*strcat(plotcmd,CHARSEPARATOR);*/
   strcat(plotcmd,GNUPLOTPROGRAM);    strcat(plotcmd,GNUPLOTPROGRAM);
 #ifndef UNIX  #ifndef UNIX
   strcat(plotcmd,"\"");    strcat(plotcmd,".exe");
     /*  strcat(plotcmd,"\"");*/
 #endif  #endif
   if(stat(plotcmd,&info)){    if(stat(plotcmd,&info)){
     printf("Error gnuplot program not found: %s\n",plotcmd);fflush(stdout);      printf("Error gnuplot program not found: %s\n",plotcmd);fflush(stdout);
   }    }
   
   #ifndef UNIX
     strcpy(plotcmd,"\"");
   #endif
     strcat(plotcmd,pathimach);
     strcat(plotcmd,GNUPLOTPROGRAM);
   #ifndef UNIX
     strcat(plotcmd,".exe");
     strcat(plotcmd,"\"");
   #endif
   strcat(plotcmd," ");    strcat(plotcmd," ");
   strcat(plotcmd,optionfilegnuplot);    strcat(plotcmd,optionfilegnuplot);
   printf("Starting graphs with: %s",plotcmd);fflush(stdout);    printf("Starting graphs with: %s",plotcmd);fflush(stdout);
   
   if((outcmd=system(plotcmd)) != 0){    if((outcmd=system(plotcmd)) != 0){
     printf(" Problem with gnuplot\n");      printf("\n Problem with gnuplot\n");
   }    }
   printf(" Wait...");    printf(" Wait...");
   while (z[0] != 'q') {    while (z[0] != 'q') {
Removed from v.1.107  
changed lines
  Added in v.1.108

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>