X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=include%2Fphantom.h;h=9eb0bf37eb32cf4aeb2fcd8e40e8fafa0400c220;hb=b3db4c787d9180525a56306d8e91553d81def8b8;hp=f67679c6f1ee1315685353b9f28836c58edf7972;hpb=9f29c8b32c972db1178d6f8551d5cd57ceb67083;p=ctsim.git

diff --git a/include/phantom.h b/include/phantom.h
index f67679c..9eb0bf3 100644
--- a/include/phantom.h
+++ b/include/phantom.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: phantom.h,v 1.21 2001/01/28 19:10:18 kevin Exp $
+**  $Id$
 **
 **  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
@@ -69,7 +69,6 @@ class PhantomElement
     double* const xOutline() const {return m_xOutline;}
     double* const yOutline() const {return m_yOutline;}
     const double atten() const {return m_atten;}
-    const double diameter() const {return m_diameter;}
     const double xmin() const {return m_xmin;}
     const double xmax() const {return m_xmax;}
     const double ymin() const {return m_ymin;}
@@ -80,6 +79,8 @@ class PhantomElement
     const double u() const {return m_u;}
     const double v() const {return m_v;}
 
+    static PhmElemType convertNameToType (const char* const typeName);
+
     void printDefinition (std::ostream& os) const;
     void printDefinition (std::ostringstream& os) const;
 
@@ -92,7 +93,6 @@ class PhantomElement
     double *m_x, *m_y;	     // ptr to array of points in obj world coord 
     int m_nPoints;		     // number of points in outline arrays 
     double m_xmin, m_xmax, m_ymin, m_ymax;  // pelem limits 
-    double m_diameter;	     
     GRFMTX_2D m_xformPhmToObj;        // map from phantom to normalized pelem coords
     GRFMTX_2D m_xformObjToPhm;        // map from normalized pelem coords to phantom coords 
     double* m_xOutline;
@@ -102,7 +102,6 @@ class PhantomElement
     static const int POINTS_PER_CIRCLE;
     static const double SCALE_PELEM_EXTENT;  // increase pelem limits by 0.5% 
 
-    static PhmElemType convertNameToType (const char* const typeName);
     static const char* const convertTypeToName (PhmElemType iType);
 
     void makeTransformMatrices ();
@@ -138,9 +137,7 @@ class Phantom
  public:
     static const int PHM_INVALID;
     static const int PHM_HERMAN;
-    static const int PHM_B_HERMAN;
     static const int PHM_SHEPP_LOGAN;
-    static const int PHM_B_SHEPP_LOGAN;
     static const int PHM_UNITPULSE;
 
     Phantom ();
@@ -166,9 +163,11 @@ class Phantom
 
     void addPElem (const char* const composition, const double cx, const double cy, const double u, const double v, const double rot, const double atten);
 
-    void convertToImagefile (ImageFile& im, const int in_nsample, const int trace, const int colStart, const int colCount, bool bStoreAtColumnPos) const;
-
-    void convertToImagefile (ImageFile& im, const int in_nsample, const int trace) const;
+    void convertToImagefile (ImageFile& im, double dViewRatio, const int in_nsample, const int trace) const;
+    void convertToImagefile (ImageFile& im, double dViewRatio, const int in_nsample, const int trace, 
+      const int colStart, const int colCount, bool bStoreAtColumnPos) const;
+    void convertToImagefile (ImageFile& im, int iNX, double dViewRatio, const int in_nsample, const int trace, 
+      const int colStart, const int colCount, int iStorageOffset) const;
 
     void printDefinitions (std::ostream& os) const;
     void printDefinitions (std::ostringstream& os) const;
@@ -178,23 +177,24 @@ class Phantom
     const std::string& name() const     {return m_name;}
     const int id() const     {return m_id;}
 
-#if HAVE_SGP
+#ifdef HAVE_SGP
     void show () const;
     void show (SGP& sgp) const;
     void draw (SGP& sgp) const;
 #endif
     
     void addStdHerman ();
-    void addStdHermanBordered ();
     void addStdSheppLogan ();
-    void addStdSheppLoganBordered ();
 
     void print (std::ostream& os) const;
     void print (std::ostringstream& os) const;
 
-    const double maxAxisLength () const {return (((m_xmax - m_xmin) > (m_ymax - m_ymin)) ? (m_xmax - m_xmin) : (m_ymax - m_ymin));}
+    double maxAxisLength () const 
+    {  return maxValue<double> (m_xmax - m_xmin, m_ymax - m_ymin); }
+
+    double getDiameterBoundaryCircle() const 
+    { return SQRT2 * maxAxisLength(); }
 
-    const double diameter() const {return m_diameter;}
     const double xmin() const {return m_xmin;}
     const double xmax() const {return m_xmax;}
     const double ymin() const {return m_ymin;}
@@ -214,13 +214,11 @@ class Phantom
     PhantomComposition m_composition;
     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 std::list<PhantomElement*> m_listPElem;      // pelem lists
     std::string m_name;
     int m_id;
     bool m_fail;
     std::string m_failMessage;
-
     static const char* s_aszPhantomName[];
     static const char* s_aszPhantomTitle[];
     static const int s_iPhantomCount;