X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=include%2Fphantom.h;h=e30ce87934c8234344b895d96be5c9cd56dd6233;hb=aa41f74ce0ec15bc7952ed9da629dbe294429a61;hp=399c542a02a98d7491635164c5d070d3c722dc48;hpb=3147cd44cff6132e51eac1a179c1fc3d405faacc;p=ctsim.git

diff --git a/include/phantom.h b/include/phantom.h
index 399c542..e30ce87 100644
--- a/include/phantom.h
+++ b/include/phantom.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: phantom.h,v 1.14 2000/09/04 09:06:46 kevin Exp $
+**  $Id: phantom.h,v 1.17 2000/12/16 06:12:47 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,11 +28,9 @@
 #ifndef PHANTOM_H
 #define PHANTOM_H
 
-#include <slist>
+#include <list>
 #include "ctsupport.h"
 
-using namespace std;
-
 typedef enum {
     PELEM_INVALID,
     PELEM_RECTANGLE,
@@ -96,8 +94,8 @@ class PhantomElement
     double* m_yOutline;
     double  m_rectLimits[4];
 
-    static const int POINTS_PER_CIRCLE = 360;
-    static const double SCALE_PELEM_EXTENT=0.005;  // increase pelem limits by 0.5% 
+    static const int POINTS_PER_CIRCLE;
+    static const double SCALE_PELEM_EXTENT;  // increase pelem limits by 0.5% 
 
     static PhmElemType PhantomElement::convertNameToType (const char* const typeName);
 
@@ -165,8 +163,8 @@ class Phantom
     void convertToImagefile (ImageFile& im, const int in_nsample, const int trace) const;
 
     bool fail() const             {return m_fail;}
-    const string& failMessage() const {return m_failMessage;}
-    const string& name() const     {return m_name;}
+    const std::string& failMessage() const {return m_failMessage;}
+    const std::string& name() const     {return m_name;}
     const int id() const     {return m_id;}
 
 #if HAVE_SGP
@@ -189,8 +187,8 @@ class Phantom
     const double xmax() const {return m_xmax;}
     const double ymin() const {return m_ymin;}
     const double ymax() const {return m_ymax;}
-    slist<PhantomElement*>& listPElem() {return m_listPElem;}
-    const slist<PhantomElement*>& listPElem() const {return m_listPElem;}
+	std::list<PhantomElement*>& listPElem() {return m_listPElem;}
+    const std::list<PhantomElement*>& listPElem() const {return m_listPElem;}
     const int nPElem() const {return m_nPElem;}
 
     static const int getPhantomCount() {return s_iPhantomCount;}
@@ -205,11 +203,11 @@ class Phantom
     int m_nPElem;		            // number of pelems in phantom 
     double m_xmin, m_xmax, m_ymin, m_ymax;  // extent of pelems in pelem coordinates
     double m_diameter;                        // diameter of object
-    mutable slist<PhantomElement*> m_listPElem;      // pelem lists
-    string m_name;
+    mutable std::list<PhantomElement*> m_listPElem;      // pelem lists
+    std::string m_name;
     int m_id;
     bool m_fail;
-    string m_failMessage;
+    std::string m_failMessage;
 
     static const char* s_aszPhantomName[];
     static const char* s_aszPhantomTitle[];
@@ -221,7 +219,7 @@ class Phantom
     Phantom& operator= (const Phantom&); // assignment operator
 };
 
-typedef slist<PhantomElement*>::iterator PElemIterator;
-typedef slist<PhantomElement*>::const_iterator PElemConstIterator;
+typedef std::list<PhantomElement*>::iterator PElemIterator;
+typedef std::list<PhantomElement*>::const_iterator PElemConstIterator;
 
 #endif