X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=libctsim%2Fphantom.cpp;h=2063683d0675d8532a2a31feb635c4ecf8e3a82a;hb=286d655a25df2668bd65ad365676c6ecc94415a1;hp=8d4ea38475d0936bd8301d30a1497a60f666f6c5;hpb=04c6595c9b3a36151671fd8f697f8a9a38dce735;p=ctsim.git

diff --git a/libctsim/phantom.cpp b/libctsim/phantom.cpp
index 8d4ea38..2063683 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.9 2000/07/20 11:17:31 kevin Exp $
+**  $Id: phantom.cpp,v 1.10 2000/07/22 15:45:33 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
@@ -28,25 +28,39 @@
 #include "ct.h"
 
 
-const char Phantom::PHM_HERMAN_STR[]=    "herman";
-const char Phantom::PHM_BHERMAN_STR[]=   "bherman";
-const char Phantom::PHM_ROWLAND_STR[]=   "rowland";
-const char Phantom::PHM_BROWLAND_STR[]=  "browland";
-const char Phantom::PHM_UNITPULSE_STR[]= "unitpulse";
+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_UNITPULSE = 4;
 
-const char Phantom::PHM_HERMAN_TITLE_STR[]=    "Herman Head";
-const char Phantom::PHM_BHERMAN_TITLE_STR[]=   "Herman Head Bordered";
-const char Phantom::PHM_ROWLAND_TITLE_STR[]=   "Rowland Head";
-const char Phantom::PHM_BROWLAND_TITLE_STR[]=  "Rowland Head Bordered";
-const char Phantom::PHM_UNITPULSE_TITLE_STR[]= "Unit Pulse";
+const char* Phantom::s_aszPhantomName[] = 
+{
+  {"herman"},
+  {"bherman"},
+  {"rowland"},
+  {"browland"},
+  {"unitpulse"},
+};
+
+const char* Phantom::s_aszPhantomTitle[] = 
+{
+  {"Herman Head"},
+  {"Herman Head Bordered"},
+  {"Rowland Head"},
+  {"Rowland Head Bordered"},
+  {"Unit Pulse"},
+};
 
+const int Phantom::s_iPhantomCount = sizeof(s_aszPhantomName) / sizeof(const char*);
 
 
 // CLASS IDENTIFICATION
-//   Phanton
+//   Phantom
 //
 
-Phantom::Phantom (void)
+Phantom::Phantom ()
 {
   init ();
 }
@@ -59,7 +73,7 @@ Phantom::Phantom (const char* const phmName)
 }
 
 void 
-Phantom::init (void)
+Phantom::init ()
 {
   m_nPElem = 0;
   m_xmin = 1E30;
@@ -72,7 +86,7 @@ Phantom::init (void)
   m_id = PHM_INVALID;
 }
 
-Phantom::~Phantom (void)
+Phantom::~Phantom ()
 {
   for (PElemIterator i = m_listPElem.begin(); i != m_listPElem.end(); i++) {
     delete *i;
@@ -81,39 +95,37 @@ Phantom::~Phantom (void)
 
 
 const char*
-Phantom::convertPhantomIDToName (const PhantomID phmID)
+Phantom::convertPhantomIDToName (int phmID)
 {
-  const char *name = "";
+  static const char *name = "";
 
-  if (phmID == PHM_HERMAN)
-    name = PHM_HERMAN_STR;
-  else if (phmID == PHM_BHERMAN)
-    name = PHM_BHERMAN_STR;
-  else if (phmID == PHM_ROWLAND)
-    name = PHM_ROWLAND_STR;
-  else if (phmID == PHM_BROWLAND)
-    name = PHM_BROWLAND_STR;
-  else if (phmID == PHM_UNITPULSE)
-    name = PHM_UNITPULSE_STR;
+  if (phmID >= 0 && phmID < s_iPhantomCount)
+      return (s_aszPhantomName[phmID]);
 
   return (name);
 }
+
+const char*
+Phantom::convertPhantomIDToTitle (int phmID)
+{
+  static const char *title = "";
+
+  if (phmID >= 0 && phmID < s_iPhantomCount)
+      return (s_aszPhantomName[phmID]);
+
+  return (title);
+}
       
-Phantom::PhantomID
+int
 Phantom::convertNameToPhantomID (const char* const phmName) 
 {
-  PhantomID id = PHM_INVALID;
+  int id = PHM_INVALID;
 
-  if (strcasecmp (phmName, PHM_HERMAN_STR) == 0)
-    id = PHM_HERMAN;
-  else if (strcasecmp (phmName, PHM_BHERMAN_STR) == 0)
-    id = PHM_BHERMAN;
-  else if (strcasecmp (phmName, PHM_ROWLAND_STR) == 0)
-    id = PHM_ROWLAND;
-  else if (strcasecmp (phmName, PHM_BROWLAND_STR) == 0)
-    id = PHM_BROWLAND;
-  else if (strcasecmp (phmName, PHM_UNITPULSE_STR) == 0)
-    id = PHM_UNITPULSE;
+  for (int i = 0; i < s_iPhantomCount; i++)
+      if (strcasecmp (phmName, s_aszPhantomName[i]) == 0) {
+	  id = i;
+	  break;
+      }
 
   return (id);
 }
@@ -122,7 +134,7 @@ Phantom::convertNameToPhantomID (const char* const phmName)
 bool
 Phantom::createFromPhantom (const char* const phmName)
 {
-  PhantomID phmid = convertNameToPhantomID (phmName);
+  int phmid = convertNameToPhantomID (phmName);
   if (phmid == PHM_INVALID) {
     m_fail = true;
     m_failMessage = "Invalid phantom name ";
@@ -136,7 +148,7 @@ Phantom::createFromPhantom (const char* const phmName)
 }
 
 bool
-Phantom::createFromPhantom (const PhantomID phmid)
+Phantom::createFromPhantom (const int phmid)
 {
   switch (phmid) 
     {
@@ -262,7 +274,7 @@ Phantom::addPElem (const char *type, const double cx, const double cy, const dou
  */
 
 void 
-Phantom::print (void) const
+Phantom::print () const
 {
   printf("PRINTING Phantom\n\n");
   printf("number of pelems in Phantom = %d\n", m_nPElem);
@@ -292,7 +304,7 @@ Phantom::print (void) const
 
 #ifdef HAVE_SGP
 void 
-Phantom::show (void) const
+Phantom::show () const
 {
   double wsize = m_xmax - m_xmin;
   double xmin = m_xmin;
@@ -330,7 +342,7 @@ Phantom::show (void) const
 
 #ifdef HAVE_SGP
 void 
-Phantom::draw (void) const
+Phantom::draw () const
 {
   for (PElemIterator i = m_listPElem.begin(); i != m_listPElem.end(); i++)
     sgp2_polyline_abs ((*i)->xOutline(), (*i)->yOutline(), (*i)->nOutlinePoints());
@@ -348,7 +360,7 @@ Phantom::draw (void) const
  */
 
 void 
-Phantom::addStdRowland (void)
+Phantom::addStdRowland ()
 {
   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);
@@ -364,7 +376,7 @@ Phantom::addStdRowland (void)
 }
 
 void 
-Phantom::addStdRowlandBordered (void)
+Phantom::addStdRowlandBordered ()
 {
   addStdRowland ();
   addPElem ("ellipse", 0.000, 0.0000, 0.7500, 1.000, 0.0, 0.00);
@@ -379,7 +391,7 @@ Phantom::addStdRowlandBordered (void)
  */
 
 void 
-Phantom::addStdHerman (void)
+Phantom::addStdHerman ()
 {
   addPElem ("ellipse",  0.000,  1.50,  0.375, 0.3000,  90.00, -0.003);
   addPElem ("ellipse",  0.675, -0.75,  0.225, 0.1500, 140.00,  0.010);
@@ -399,7 +411,7 @@ Phantom::addStdHerman (void)
 }
 
 void
-Phantom::addStdHermanBordered (void)
+Phantom::addStdHermanBordered ()
 {
   addStdHerman();
   addPElem ("ellipse",  0.000, 0.000, 8.650, 8.650,  0.00, 0.000);
@@ -529,7 +541,7 @@ PhantomElement::PhantomElement (const char *type, const double cx, const double
 }
 
 
-PhantomElement::~PhantomElement (void)
+PhantomElement::~PhantomElement ()
 {
     delete m_xOutline;
     delete m_yOutline;
@@ -557,7 +569,7 @@ PhantomElement::convertNameToType (const char* const typeName)
 }
 
 void 
-PhantomElement::makeTransformMatrices (void)
+PhantomElement::makeTransformMatrices ()
 {
   GRFMTX_2D temp;
 
@@ -597,7 +609,7 @@ PhantomElement::makeTransformMatrices (void)
  */
 
 void
-PhantomElement::makeVectorOutline (void)
+PhantomElement::makeVectorOutline ()
 {
   double radius, theta, start, stop;
   double xfact, yfact;