X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=include%2Fphantom.h;h=399c542a02a98d7491635164c5d070d3c722dc48;hb=3882de63100d2cc28fe13cf3144f51a880aa4de2;hp=416b83301799c8078375a8ee31763fb51b1a43e0;hpb=286d655a25df2668bd65ad365676c6ecc94415a1;p=ctsim.git

diff --git a/include/phantom.h b/include/phantom.h
index 416b833..399c542 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.10 2000/07/22 15:45:33 kevin Exp $
+**  $Id: phantom.h,v 1.14 2000/09/04 09:06:46 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
@@ -30,8 +30,6 @@
 
 #include <slist>
 #include "ctsupport.h"
-#include "backprojectors.h"
-class ImageFile;
 
 using namespace std;
 
@@ -129,14 +127,16 @@ typedef enum {
 // Phantom Class Declaration
 //////////////////////////////////////////////////////
 
+class SGP;
+class ImageFile;
 class Phantom
 {
  public:
     static const int PHM_INVALID;
     static const int PHM_HERMAN;
-    static const int PHM_BHERMAN;
-    static const int PHM_ROWLAND;
-    static const int PHM_BROWLAND;
+    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 ();
@@ -160,7 +160,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;
 
@@ -171,13 +171,14 @@ class Phantom
 
 #if HAVE_SGP
     void show () const;
-    void draw () const;
+    void show (SGP& sgp) const;
+    void draw (SGP& sgp) const;
 #endif
     
     void addStdHerman ();
     void addStdHermanBordered ();
-    void addStdRowland ();
-    void addStdRowlandBordered ();
+    void addStdSheppLogan ();
+    void addStdSheppLoganBordered ();
 
     void print () const;