Remove hard coded version number

This should close #17
This commit is contained in:
Elad Salomons
2015-11-29 22:33:30 +02:00
parent 096167af8b
commit 395533c53d
3 changed files with 19 additions and 7 deletions

View File

@@ -133,7 +133,5 @@ char *Fldname[] = {t_ELEV, t_DEMAND, t_HEAD,
t_SETTING, t_REACTRATE, t_FRICTION,
"", "", "", "", "", "", NULL};
char *LogoTxt[] = {LOGO1,LOGO2,LOGO3,LOGO4,LOGO5,LOGO6,NULL};
#endif

View File

@@ -52,7 +52,6 @@ extern char *NodeTxt[];
extern char *LinkTxt[];
extern char *StatTxt[];
extern char *TstatTxt[];
extern char *LogoTxt[];
extern char *RptFormTxt[];
typedef REAL4 *Pfloat;
@@ -147,16 +146,31 @@ void writelogo()
**--------------------------------------------------------------
*/
{
int i;
int i;
int version;
int major;
int minor;
char s[80];
time_t timer; /* time_t structure & functions time() & */
/* ctime() are defined in time.h */
version = CODEVERSION;
major= version/10000;
minor= (version%10000)/100;
time(&timer);
strcpy(DateStamp,ctime(&timer));
PageNum = 1;
LineNum = 2;
fprintf(RptFile,FMT18);
fprintf(RptFile,"%s",DateStamp);
for (i=0; LogoTxt[i] != NULL; i++) writeline(LogoTxt[i]);
writeline(LOGO1);
writeline(LOGO2);
writeline(LOGO3);
writeline(LOGO4);
sprintf(s,LOGO5, major , minor);
writeline(s);
writeline(LOGO6);
writeline("");
} /* End of writelogo */

View File

@@ -332,10 +332,10 @@ AUTHOR: L. Rossman
#define LOGO4 \
"* Analysis for Pipe Networks *"
#define LOGO5 \
"* Version 2.1 *"
"* Version %d.%d *"
#define LOGO6 \
"******************************************************************"
#define FMT01 "\n... EPANET Version 2.1\n"
#define FMT01 "\n... EPANET Version %d.%d\n"
#define FMT02 "\n o Retrieving network data"
#define FMT03 "\n Correct syntax is:\n epanet <input file> <output file>\n"
#define FMT04 "\n Cannot use duplicate file names."