X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Fphantom.h;h=286f3ed0e94e68603d37051a989cac8f6803a415;hp=7d9b43392837c47e7b3cdd22a803095eaa346b78;hb=c00c639073653fac7463a88f2b000f263236550d;hpb=9f7d379c2b03f3c09907cfd885072433e0428042

diff --git a/include/phantom.h b/include/phantom.h
index 7d9b433..286f3ed 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.18 2001/01/02 05:33:37 kevin Exp $
+**  $Id: phantom.h,v 1.20 2001/01/02 16:02:12 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
@@ -64,10 +64,10 @@ class PhantomElement
 
     const int nOutlinePoints() const {return m_nPoints;}
     double* rectLimits() {return m_rectLimits;}
-    double* xOutline() {return m_xOutline;}
-    double* yOutline() {return m_yOutline;}
-    double* const xOutline() const {return m_xOutline;}
-    double* const yOutline() const {return m_yOutline;}
+    double* xOutline() {return m_xOutline;}
+    double* yOutline() {return m_yOutline;}
+    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;}
@@ -78,9 +78,10 @@ class PhantomElement
     const double cx() const {return m_cx;}
     const double cy() const {return m_cy;}
     const double u() const {return m_u;}
-    const double v() const {return m_v;}
-
+    const double v() const {return m_v;}
+
     void printDefinition (std::ostream& os) const;
+    void printDefinition (std::ostringstream& os) const;
 
  private:
     PhmElemType m_type;	     // pelem type (box, ellipse, etc)
@@ -102,7 +103,7 @@ class PhantomElement
     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);
+    static const char* const convertTypeToName (PhmElemType iType);
 
     void makeTransformMatrices ();
 
@@ -158,8 +159,8 @@ class Phantom
     bool createFromPhantom (const int phmid);
 
     bool createFromFile (const char* const fname);
-
-    bool fileWrite (const char* const fname);
+
+    bool fileWrite (const char* const fname);
 
     void addPElem (const PhantomElement& pelem);
 
@@ -168,8 +169,9 @@ class Phantom
     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 printDefinitions (std::ostream& os) const;
+
+    void printDefinitions (std::ostream& os) const;
+    void printDefinitions (std::ostringstream& os) const;
 
     bool fail() const             {return m_fail;}
     const std::string& failMessage() const {return m_failMessage;}
@@ -188,6 +190,7 @@ class Phantom
     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));}