X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=libctsim%2Fphantom.cpp;h=9125e36be718af7ea36959b42bf5461cd673f0ab;hp=aff37a0ac9242fae8dcd4b8e5bc72d7b970f443d;hb=f7d2b7144f32a7bd157b7689022e62944b82fcc1;hpb=3147cd44cff6132e51eac1a179c1fc3d405faacc

diff --git a/libctsim/phantom.cpp b/libctsim/phantom.cpp
index aff37a0..9125e36 100644
--- a/libctsim/phantom.cpp
+++ b/libctsim/phantom.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: phantom.cpp,v 1.18 2000/09/04 09:06:46 kevin Exp $
+**  $Id: phantom.cpp,v 1.23 2000/12/21 03:40:58 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
@@ -27,6 +27,8 @@
 
 #include "ct.h"
 
+const int PhantomElement::POINTS_PER_CIRCLE = 360;
+const double PhantomElement::SCALE_PELEM_EXTENT=0.005;  // increase pelem limits by 0.5% 
 
 const int Phantom::PHM_INVALID = -1;
 const int Phantom::PHM_HERMAN = 0;
@@ -196,41 +198,32 @@ Phantom::createFromPhantom (const int phmid)
 bool
 Phantom::createFromFile (const char* const fname)
 {
-  bool stoploop = false;
-  bool retval = false;
+  bool bGoodFile = true;
   FILE *fp;
 
   if ((fp = fopen (fname, "r")) == NULL)
     return (false);
 
   m_name = fname;
-  do {
-    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);
+
+  while (1) {
+    double cx, cy, u, v, rot, dens;
+    char pelemtype[80];
+
+    int status = fscanf (fp, "%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;
-      } else {
-	addPElem (pelemtype, cx, cy, u, v, rot, dens);
-	retval = true;
-      }
-    } else {
-      stoploop = true;
-      retval = true;
+    if (status == static_cast<int>(EOF)) 
+      break;
+    else if (status != 7) {
+      sys_error (ERR_WARNING, "Insufficient fields reading phantom file %s [Phantom::createFromFile]", fname);
+      bGoodFile = false;
     }
-  } while (stoploop == false);
+    addPElem (pelemtype, cx, cy, u, v, rot, dens);
+  }
   
   fclose (fp);
 
-  return (retval);
+  return (bGoodFile);
 }
 
 
@@ -318,7 +311,7 @@ Phantom::show () const
 
   show (sgp);
 
-  cout << "Press return to continue";
+  std::cout << "Press return to continue";
   cio_kb_getc();
 }
 
@@ -489,7 +482,7 @@ Phantom::convertToImagefile (ImageFile& im, const int in_nsample, const int trac
     for (int iy = 0; iy < ny; iy++) {
       int iColStore = ix;
       if (bStoreAtColumnPos)
-	iColStore += colStart;
+		iColStore += colStart;
       v[iColStore][iy] = 0;
     }
 
@@ -506,7 +499,7 @@ Phantom::convertToImagefile (ImageFile& im, const int in_nsample, const int trac
 	  for (kx = 0, xi = x + kxofs; kx < nsample; kx++, xi += kxinc) {
 	    for (ky = 0, yi = y + kyofs; ky < nsample; ky++, yi += kyinc)
 	      if (rPElem.isPointInside (xi, yi, PHM_COORD) == TRUE)
-		v[iColStore][iy] += rPElem.atten();
+			v[iColStore][iy] += rPElem.atten();
 	      } // for kx
 	  } /* for iy */
       }  /* for ix */
@@ -514,11 +507,16 @@ Phantom::convertToImagefile (ImageFile& im, const int in_nsample, const int trac
   
 
   if (nsample > 1) {
-    double factor = 1.0 / (nsample * nsample);
-
-    for (int ix = 0; ix < colCount; ix++)
-      for (int iy = 0; iy < ny; iy++)
-	v[ix][iy] *= factor;
+    double factor = 1.0 / static_cast<double>(nsample * nsample);
+
+
+    for (int ix = 0; ix < colCount; ix++) {
+		int iColStore = ix;
+		if (bStoreAtColumnPos)
+			iColStore += colStart;
+		for (int iy = 0; iy < ny; iy++)
+			v[iColStore][iy] *= factor;
+	}
   }
 }