** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: phantom.cpp,v 1.14 2000/07/31 14:48:35 kevin Exp $
+** $Id: phantom.cpp,v 1.15 2000/08/02 18:06:00 kevin Exp $
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License (version 2) as
return (false);
do {
- double cx, cy, u, v, rot, dens;
- char pelemtype[80];
- int n = fscanf (fp, "%79s %lf %lf %lf %lf %lf %lf",
- pelemtype, &cx, &cy, &u, &v, &rot, &dens);
+ if (! feof(fp)) {
+ double cx, cy, u, v, rot, dens;
+ char pelemtype[80];
+ char str[1024];
+ fgets (str, sizeof(str), fp);
+ int n = sscanf (str, "%79s %lf %lf %lf %lf %lf %lf", pelemtype, &cx, &cy, &u, &v, &rot, &dens);
- if (n == EOF || n == 0) { /* end of file */
- stoploop = true;
- retval = false;
- } else if (n != 7) {
- stoploop = true;
- retval = false;
+ if (n == EOF || n == 0) { /* end of file */
+ stoploop = true;
+ retval = false;
+ } else if (n != 7) {
+ stoploop = true;
+ retval = false;
+ } else {
+ addPElem (pelemtype, cx, cy, u, v, rot, dens);
+ retval = true;
+ }
} else {
- addPElem (pelemtype, cx, cy, u, v, rot, dens);
+ stoploop = true;
retval = true;
}
} while (stoploop == false);