X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=libctsim%2Fphantom.cpp;h=c74c37a19252a0406df097b5f969d632a1e41ac0;hp=09245b2205332b7ba02d2df14f0e63d66c5dbe97;hb=1e88cf0f7fa4f690ea9f110e8ed3f2b5338d0a10;hpb=74a34e63a9a356e1467acdba65497ab15190dde0

diff --git a/libctsim/phantom.cpp b/libctsim/phantom.cpp
index 09245b2..c74c37a 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.15 2000/08/02 18:06:00 kevin Exp $
+**  $Id: phantom.cpp,v 1.16 2000/08/25 15:59:13 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
@@ -30,26 +30,26 @@
 
 const int Phantom::PHM_INVALID = -1;
 const int Phantom::PHM_HERMAN = 0;
-const int Phantom::PHM_BHERMAN = 1;
-const int Phantom::PHM_ROWLAND = 2;
-const int Phantom::PHM_BROWLAND = 3;
+const int Phantom::PHM_B_HERMAN = 1;
+const int Phantom::PHM_SHEPP_LOGAN = 2;
+const int Phantom::PHM_B_SHEPP_LOGAN = 3;
 const int Phantom::PHM_UNITPULSE = 4;
 
 const char* Phantom::s_aszPhantomName[] = 
 {
   {"herman"},
-  {"bherman"},
-  {"rowland"},
-  {"browland"},
+  {"herman-b"},
+  {"shepp-logan"},
+  {"shepp-logan-b"},
   {"unitpulse"},
 };
 
 const char* Phantom::s_aszPhantomTitle[] = 
 {
   {"Herman Head"},
-  {"Herman Head Bordered"},
-  {"Rowland Head"},
-  {"Rowland Head Bordered"},
+  {"Herman Head (Bordered)"},
+  {"Shepp-Logan"},
+  {"Shepp-Logan (Bordered)"},
   {"Unit Pulse"},
 };
 
@@ -155,14 +155,14 @@ Phantom::createFromPhantom (const int phmid)
     case PHM_HERMAN:
       addStdHerman();
       break;
-    case PHM_BHERMAN:
+    case PHM_B_HERMAN:
       addStdHermanBordered();
       break;
-    case PHM_ROWLAND:
-      addStdRowland();
+    case PHM_SHEPP_LOGAN:
+      addStdSheppLogan();
       break;
-    case PHM_BROWLAND:
-      addStdRowlandBordered ();
+    case PHM_B_SHEPP_LOGAN:
+      addStdSheppLoganBordered();
       break;
     case PHM_UNITPULSE:
       m_composition = P_UNIT_PULSE;
@@ -358,7 +358,7 @@ Phantom::draw (SGP& sgp) const
 
 
 /* NAME
- *   addStdRowland		Make head phantom of S.W. Rowland
+ *   addStdSheppLogan	Make head phantom of Shepp-Logan
  *
  * REFERENCES
  *   S. W. Rowland, "Computer Implementation of Image Reconstruction
@@ -367,7 +367,7 @@ Phantom::draw (SGP& sgp) const
  */
 
 void 
-Phantom::addStdRowland ()
+Phantom::addStdSheppLogan ()
 {
   addPElem ("ellipse",  0.0000,  0.0000, 0.6900,  0.9200,   0.0,  1.00);
   addPElem ("ellipse",  0.0000, -0.0184, 0.6624,  0.8740,   0.0, -0.98);
@@ -383,9 +383,9 @@ Phantom::addStdRowland ()
 }
 
 void 
-Phantom::addStdRowlandBordered ()
+Phantom::addStdSheppLoganBordered ()
 {
-  addStdRowland ();
+  addStdSheppLogan ();
   addPElem ("rectangle", 0.000, 0.0000, 0.7500, 1.000, 0.0, 0.00);
 }
 
@@ -421,7 +421,7 @@ void
 Phantom::addStdHermanBordered ()
 {
   addStdHerman();
-  addPElem ("rectangle",  0.000, 0.000, 8.650, 8.650,  0.00, 0.000);
+  addPElem ("rectangle",  0.000, 0.00, 9.000, 6.800,  0.00, 0.000);
 }