X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Fphantom.h;h=bc245ee7512e7a5477e875399ba8574aa712c955;hp=56a8007f72a87c2a02dabb0936087cd7b86a58ee;hb=01ee1e0085970643368d65c38b09008927e24cd5;hpb=1e88cf0f7fa4f690ea9f110e8ed3f2b5338d0a10

diff --git a/include/phantom.h b/include/phantom.h
index 56a8007..bc245ee 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.13 2000/08/25 15:59:13 kevin Exp $
+**  $Id: phantom.h,v 1.15 2000/12/04 05:36:57 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,7 +28,9 @@
 #ifndef PHANTOM_H
 #define PHANTOM_H
 
+#ifndef MSVC
 #include <slist>
+#endif
 #include "ctsupport.h"
 
 using namespace std;
@@ -96,8 +98,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);
 
@@ -160,7 +162,7 @@ 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) const;
+    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;