X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Fphantom.h;h=9eb0bf37eb32cf4aeb2fcd8e40e8fafa0400c220;hp=ae5ba45a951ca2391e16700ee498c2161029c691;hb=8a7697ce57b56cdc43698cd1241ad98d49f9b5ac;hpb=3f6c94c6bd432ad7b7a55ad991d3b8223fb44f18 diff --git a/include/phantom.h b/include/phantom.h index ae5ba45..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.24 2001/02/20 04:48:45 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 @@ -79,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; @@ -100,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 (); @@ -162,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, 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;