r4205: *** empty log message ***

[ctsim.git] / include / phantom.h

diff --git a/include/phantom.h b/include/phantom.h
index ae5ba45a951ca2391e16700ee498c2161029c691..ca13f36f99f39a6bdca83d06d83d3fcb6e70bfa5 100644 (file)
--- 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.24 2001/02/20 04:48:45 kevin Exp $
+**  $Id: phantom.h,v 1.26 2003/03/15 14:52:36 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
@@ -100,8 +100,8 @@ 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);
+    static PhmElemType convertNameToType (const char* const typeName);
 
     void makeTransformMatrices ();
 
@@ -162,9 +162,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, double dViewRatio, const int in_nsample, const int trace, const int colStart, const int colCount, bool bStoreAtColumnPos) 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;